From 9af0b0fc7b8c3a2989aae8a11e6a6b24695128ef Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Mon, 18 Mar 2024 10:35:34 +0100 Subject: [PATCH] Fix after merge --- template-coq/_PluginProject | 4 ++-- template-coq/_PluginProject.in | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/template-coq/_PluginProject b/template-coq/_PluginProject index cc5f3c211..314e020ac 100644 --- 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 index db0886636..dcecb5541 100644 --- 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