fix git stuff

Author: mjohnson541

input/quantum_corrections/data.py

@@ -417,47 +417,6 @@
     },
 
     "CompositeLevelOfTheory(freq=LevelOfTheory(method='wb97xd3',basis='def2tzvp',software='qchem'),energy=LevelOfTheory(method='ccsd(t)f12',basis='ccpvdzf12',software='molpro'))": {
-<<<<<<< HEAD
-        'C#C': -0.7940736288861328,
-        'C#N': -0.2736082180869344,
-        'C#O': 1.215648303725274,
-        'C-C': -0.006153161261658441,
-        'C-Cl': 0.7595723077901367,
-        'C-F': 0.4815204101380463,
-        'C-H': 0.010156098370800108,
-        'C-N': 0.10438905540134882,
-        'C-O': 0.09987252247930076,
-        'C-S': 0.4090396417072708,
-        'C=C': -0.32837634513571645,
-        'C=N': -0.6872690836499937,
-        'C=O': -0.011879042720396643,
-        'C=S': -0.45740929709171363,
-        'Cl-Cl': -0.014451326911147977,
-        'Cl-F': 0.6479093120532244,
-        'Cl-H': 0.37650914650193457,
-        'Cl-N': 0.5872703379266317,
-        'Cl-O': 0.5095510277409292,
-        'Cl-S': 0.646585596795355,
-        'F-F': -0.7037812030852666,
-        'F-H': 0.13879622147405257,
-        'F-O': -0.5823379151756342,
-        'F-S': 0.9474443582208304,
-        'H-H': -0.00879296155638677,
-        'H-N': -0.3973581320058072,
-        'H-O': -0.05082328074118156,
-        'H-S': 0.9006352849672502,
-        'N#N': 0.6426432154389473,
-        'N-N': 1.0261474051290596,
-        'N-O': -0.03642922490749102,
-        'N=N': 0.1708502331465831,
-        'N=O': -0.8042125954300557,
-        'O-O': -0.7325577965540944,
-        'O-S': -0.18825122982916948,
-        'O=O': -2.7021030234346695,
-        'O=S': 0.9232025676598207,
-        'S-S': 0.14102013117456597,
-        'S=S': -0.9855656265939845
-=======
         'C#C': -0.6052322399541471,
         'C#N': -0.15387478974073196,
         'C#O': 1.3495267208804052,
@@ -501,7 +460,6 @@
         'O=S': 0.9395438684125166,
         'S-S': 0.162448613434227,
         'S=S': -0.9512223213246404
->>>>>>> 891ee1b7a... BACs including Li for ccsd(t)f12/ccpvdzf12//wb97xd3/def2tzvp
     },
 
     "LevelOfTheory(method='b97d3',basis='def2msvp',software='qchem')": {