-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Cameron wrote: > Public bug reported: > > I had a conflict in a file that had the string ===================== in > it.
That string, like <<<<<<< and >>>>>>>, is a conflict marker.
Aaron -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHsp390F+nu1YWqI0RAhF5AJ9X6MbzfO3xLmD0s4YRMP/kVt7kMgCeNI5o XDuYLUxkbqdzUdm0uY5V3jA= =BlLb -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Cameron wrote: ======= ======= in
> Public bug reported:
>
> I had a conflict in a file that had the string =======
> it.
That string, like <<<<<<< and >>>>>>>, is a conflict marker.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFHsp390F+ nu1YWqI0RAhF5AJ 9X6MbzfO3xLmD0s 4YRMP/kVt7kMgCe NI5o 0uY5V3jA=
XDuYLUxkbqdzUdm
=BlLb
-----END PGP SIGNATURE-----