commit: manually resolve merge problem

[Ben Wing]

changeset:   5121:c6c982484f87
branch:      ben-lisp-object
user:        Ben Wing <ben at xemacs.org>
date:        Wed Dec 30 04:27:30 2009 -0600
files:       .hgtags
description:
manually resolve merge problem


diff -r d1247f3cc363 -r c6c982484f87 .hgtags
--- a/.hgtags	Mon Dec 28 01:15:52 2009 -0600
+++ b/.hgtags	Wed Dec 30 04:27:30 2009 -0600
@@ -235,9 +235,6 @@
 223736d75acb5265cfd9352497e8483d787d8eab r21-2-45
 0784d089fdc93fb58040b6efbec55cd4fdf650c2 r21-2-46
 5aa1854ad5374fa936e99e22e7b1242097292f16 r21-2-47
-<<<<<<< local
 aaf96f4ba61234a5331b280b774d357503cd7994 ben-lisp-object-bp
-=======
 1af222c7586991f690ea06d1b8c75fb5a6a0a352 r21-5-28
 5c427ece884b7023a244fba8cad8cf41b37dd5ca r21-5-29
->>>>>>> other