diff options
| author | lloyd <[email protected]> | 2009-12-16 05:15:42 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 05:15:42 +0000 |
| commit | 85b961ff87c1d6300451538c939c99a2ff74b505 (patch) | |
| tree | b5d9ce5c5ce5d1bbce62bac513edbb8c84ad4521 /src/math | |
| parent | 317b76d71dca1840c9e72f9a26407590719c1423 (diff) | |
Post-merge fixes
Diffstat (limited to 'src/math')
| -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 |