DOC: File folder location accepted changes

jeromefv · jeromefv · commit df0b3db7a6b8 · 2020-09-14T18:41:45.000-07:00
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -93,9 +93,15 @@ A new environment can be set up with ::
 
 and activated with one of the following::
 
+<<<<<<< HEAD
    source <file folder location>/bin/activate  # Linux/macOS
    <file folder location>\Scripts\activate.bat  # Windows cmd.exe
    <file folder location>\Scripts\Activate.ps1  # Windows PowerShell
+=======
+   source <file folder location>/bin/activate  # Linux/macOS
+   <file folder location>\Scripts\activate.bat  # Windows cmd.exe
+   <file folder location>\Scripts\Activate.ps1  # Windows PowerShell
+>>>>>>> f9a2879ad64405c6bbf3d0719a3d264b096d6228
 
 Whenever you plan to work on Matplotlib, remember to activate the development
 environment in your shell!
