Fix merge conflict

QuantumKitHub · Jul 12, 2024 · d5506fd · d5506fd
1 parent 8520bc3
commit d5506fd
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -37,13 +37,8 @@ opt_alg = PEPSOptimize(;
 
 # ground state search
 state = InfinitePEPS(2, D)
-<<<<<<< HEAD
 ctm = leading_boundary(CTMRGEnv(state, ComplexSpace(chi)), state, ctm_alg)
-result = fixedpoint(state, Heisenberg_hamiltonian, opt_alg, ctm)
-=======
-ctm = leading_boundary(CTMRGEnv(state; Venv=ComplexSpace(chi)), state, ctm_alg)
 result = fixedpoint(state, H, opt_alg, ctm)
->>>>>>> master
 
 @show result.E # -0.6625...
 ```