Merging main.

relic-toolkit · Apr 8, 2024 · f3a7826 · f3a7826
1 parent dba4537
commit f3a7826
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/include/relic_label.h b/include/relic_label.h
@@ -3320,8 +3320,6 @@
 #undef cp_lvprv_ask
 #undef cp_lvprv_ans
 #undef cp_lvprv_ver
-<<<<<<< Updated upstream
-=======
 #undef cp_ampub_gen
 #undef cp_ampub_ask
 #undef cp_ampub_ans
@@ -3330,7 +3328,6 @@
 #undef cp_amprv_ask
 #undef cp_amprv_ans
 #undef cp_amprv_ver
->>>>>>> Stashed changes
 #undef cp_sokaka_gen
 #undef cp_sokaka_gen_prv
 #undef cp_sokaka_key