Fix after merge

MetaCoq · Mar 18, 2024 · 9af0b0f · 9af0b0f
1 parent 5c8e1b0
commit 9af0b0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/template-coq/_PluginProject b/template-coq/_PluginProject
@@ -105,8 +105,8 @@ gen-src/hexadecimal.ml
 gen-src/hexadecimal.mli
 # gen-src/hexadecimalString.ml
 # gen-src/hexadecimalString.mli
-gen-src/induction.ml
-gen-src/induction.mli
+gen-src/induction0.ml
+gen-src/induction0.mli
 gen-src/init.ml
 gen-src/init.mli
 gen-src/int0.ml

diff --git a/template-coq/_PluginProject.in b/template-coq/_PluginProject.in
@@ -101,17 +101,10 @@ gen-src/floatOps.ml
 gen-src/floatOps.mli
 gen-src/hexadecimal.ml
 gen-src/hexadecimal.mli
-<<<<<<< HEAD
-gen-src/hexadecimalString.ml
-gen-src/hexadecimalString.mli
-gen-src/induction0.ml
-gen-src/induction0.mli
-=======
 # gen-src/hexadecimalString.ml
 # gen-src/hexadecimalString.mli
-gen-src/induction.ml
-gen-src/induction.mli
->>>>>>> coq-8.18
+gen-src/induction0.ml
+gen-src/induction0.mli
 gen-src/init.ml
 gen-src/init.mli
 gen-src/int0.ml