Update LLVM.lock

matter-labs · Apr 4, 2024 · eb36b04 · eb36b04
1 parent 42d07b5
commit eb36b04
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/LLVM.lock b/LLVM.lock
@@ -1,6 +1,2 @@
 url = "https://github.com/matter-labs/era-compiler-llvm"
-<<<<<<< HEAD
-branch = "v1.4.1"
-=======
 branch = "main"
->>>>>>> d020375 (Final sync with the private repo)