diff options
Diffstat (limited to 'src/math/gfpmath/info.txt')
| -rw-r--r-- | src/math/gfpmath/info.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt index 55ae8b5e6..b7b430805 100644 --- a/src/math/gfpmath/info.txt +++ b/src/math/gfpmath/info.txt @@ -7,15 +7,7 @@ gfp_modulus.h point_gfp.h </header:public> -<<<<<<< variant A <source> ->>>>>>> variant B -<add> -####### Ancestor -define BIGINT_GFP - -<add> -======= end curve_gfp.cpp gfp_element.cpp point_gfp.cpp |