From e4eaf898552db3dd02684e2f1ffe051362e11274 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 8 Nov 2003 22:20:08 +0000 Subject: [PATCH] Resolve CVS conflicts --- lisp/language/kannada.el | 1 + lisp/language/knd-util.el | 1 + 2 files changed, 2 insertions(+) diff --git a/lisp/language/kannada.el b/lisp/language/kannada.el index 06f7719265a..fe6a1424b95 100644 --- 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 e0aa219fe4a..c856808bd77 100644 --- 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 -- 2.39.2