Resolve CVS conflicts

[bpt/emacs.git] / lisp / language / knd-util.el

diff --git a/lisp/language/knd-util.el b/lisp/language/knd-util.el
index e0aa219..c856808 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