Mercurial > octave
changeset 25222:2a6e9a3386fa
maint: Remove merge conflict markers from .hgtags file.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 11 Apr 2018 21:51:35 -0400 |
parents | 22ece7843499 |
children | 0f98040552de |
files | .hgtags |
diffstat | 1 files changed, 0 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Apr 11 16:45:53 2018 -0700 +++ b/.hgtags Wed Apr 11 21:51:35 2018 -0400 @@ -108,8 +108,5 @@ 69ac19073ae630b276ff7788b78f72782f281657 rc-4-2-0-4 708a4fcb73820484a3af94dd4d18453c4d9b29c9 release-4-2-0 1327ea4f5a931a6cc2a6d4790af58cf16de4702b release-4-2-1 -<<<<<<< working copy 94f8e2b5a88b79974084c0ae541cacbcc62d64f6 release-4-2-2 -======= a5ad9c053e41ed39a8c69ff99936cbcf18256abf rc-4-3-90 ->>>>>>> merge rev