!f settings

ReactionMechanismGenerator · Nov 27, 2022 · ee00e38 · ee00e38
1 parent b4fd444
commit ee00e38
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/arc/settings/settings.py b/arc/settings/settings.py
@@ -95,12 +95,8 @@
 # Avoid ascribing the same phrase to more than one software, this may cause undeterministic assignment of software
 # Format is levels_ess = {ess: ['phrase1', 'phrase2'], ess2: ['phrase3', 'phrase3']}
 levels_ess = {
-<<<<<<< main
     'cfour': ['casscf'],
     'gaussian': ['apfd', 'b3lyp', 'm062x'],
-=======
-    'gaussian': ['apfd', 'b3lyp', 'm062x', 'hf'],
->>>>>>> added psi4 to many locations
     'molpro': ['ccsd', 'cisd', 'vpz'],
     'qchem': ['m06-2x'],
     'orca': ['dlpno'],