Resolve CVS conflicts

2003-11-08 22:20:08 +00:00
parent cfda993e1a
commit e4eaf89855
2 changed files with 2 additions and 0 deletions
--- a/lisp/language/kannada.el
+++ b/lisp/language/kannada.el
@@ -43,4 +43,5 @@ environment."))

 (provide 'kannada)

+;;; arch-tag: 880ba90b-f6f5-4131-bc1d-930705b78416
 ;;; kannada.el ends here
--- a/lisp/language/knd-util.el
+++ b/lisp/language/knd-util.el
@@ -537,4 +537,5 @@ Default value contains only the basic rules.")

 (provide 'knd-util)

+;;; arch-tag: 78d32230-a960-46a5-b622-61ed6ffcf8fc
 ;;; knd-util.el ends here