Fix after merge

Author: mattam82

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

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