Update _config.yml

ProjectPythia · May 24, 2024 · af355eb · af355eb
1 parent c2bae71
commit af355eb
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/_config.yml b/_config.yml
@@ -7,12 +7,7 @@ logo: notebooks/images/logos/pythia_logo-white-rtext.svg
 copyright: "2024"
 
 execute:
-  # To execute notebooks via a Binder instead, replace 'cache' with 'binder'
-<<<<<<< HEAD
-  execute_notebooks: "off"
-=======
   execute_notebooks: 'off'
->>>>>>> c6e5e4140ae752390e8c68fc4d76ca4ac4ec0f04
   timeout: 600
   allow_errors: False # cells with expected failures must set the `raises-exception` cell tag