Resolve CVS conflicts

diff --git a/lisp/language/kannada.el b/lisp/language/kannada.el
index 06f7719265ad31504e71180bda4ab6bf9d132067..fe6a1424b9557ada7fae4d856cf98f7fd54ea5ba 100644 (file)
--- 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

diff --git a/lisp/language/knd-util.el b/lisp/language/knd-util.el
index e0aa219fe4ab4e6154fb10bcacaeac0413dfcd00..c856808bd77a9073a1c37199c58e096de84e914e 100644 (file)
--- 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