Mercurial > emacs
diff man/doclicense.texi @ 76254:5ae1368180c3
Remove conflict marker.
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Thu, 01 Mar 2007 13:58:24 +0000 |
parents | c7e4f78b81a6 |
children | 5b28b265d0ea 858cb33ae39d |
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Thu, 01 Mar 2007 13:58:24 +0000 |
parents | c7e4f78b81a6 |
children | 5b28b265d0ea 858cb33ae39d |