[Gzz-commits] manuscripts/Sigs article.rst

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Benja Fallenstein <address@hidden>      03/05/18 15:50:56

Modified files:
        Sigs           : article.rst 

Log message:
        fix cvs conflict

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Sigs/article.rst.diff?tr1=1.96&tr2=1.97&r1=text&r2=text

Patches:
Index: manuscripts/Sigs/article.rst
diff -u manuscripts/Sigs/article.rst:1.96 manuscripts/Sigs/article.rst:1.97
--- manuscripts/Sigs/article.rst:1.96   Sun May 18 15:48:55 2003
+++ manuscripts/Sigs/article.rst        Sun May 18 15:50:56 2003
@@ -536,14 +536,11 @@
 
 ?
 
-<<<<<<< article.rst
 - serious vulnerabilities with chosen-message multiple signatures,
 
-=======
 Octuplet: `$(1, b, kh, th, h, t, 1, 1+k)$`
 
 
->>>>>>> 1.93
 Bleichenbacher-Maurer
 ---------------------