@@ -453,11 +453,17 @@ def draw_path(self, gc, path, transform, rgbFace=None):
                      r"{\pgfqpoint{0in}{0in}}{\pgfqpoint{1in}{1in}}")
             _writeln(self.fh, r"\pgfusepath{clip}")
             scale = mpl.transforms.Affine2D().scale(self.dpi)
+            # Store default PGF line width
+            _writeln(self.fh, r"\newlength{\defaultpgflinewidth}")
+            _writeln(self.fh,
+                     r"\setlength{\defaultpgflinewidth}{\pgflinewidth}")
             lw = (mpl.rcParams["hatch.linewidth"]
                   * mpl_pt_to_in * latex_in_to_pt)
             _writeln(self.fh, r"\pgfsetlinewidth{%fpt}" % lw)
             self._print_pgf_path(None, gc.get_hatch_path(), scale)
             self._pgf_path_draw(stroke=True)
+            # Restore default PGF line width
+            _writeln(self.fh, r"\pgfsetlinewidth{\defaultpgflinewidth}")
             _writeln(self.fh, r"\end{pgfscope}")
             _writeln(self.fh, r"}")
             # repeat pattern, filling the bounding rect of the path
 
@@ -377,7 +377,6 @@ def test_sketch_params():
     assert baseline in buf
 
 
-<<<<<<< HEAD
 # test to make sure that the document font size is set consistently (see #26892)
 @needs_pgf_xelatex
 @pytest.mark.skipif(
@@ -400,7 +399,8 @@ def test_document_font_size():
              label=r'\normalsize the document font size is \the\fontdimen6\font'
              )
     plt.legend()
-=======
+
+
 @needs_pgf_xelatex
 @pytest.mark.backend('pgf')
 @image_comparison(['hatch_linewidth'], extensions=['pdf'])
@@ -409,4 +409,3 @@ def test_pgf_hatch_linewidth():
     mpl.rcParams['hatch.linewidth'] = 0.1
 
     plt.bar(1, 1, color='white', edgecolor='black', hatch='/')
->>>>>>> 7cbcd44f9a (Fix hatch linewidth in PGF)