diff options
| author | Miles Bader | 2003-11-08 22:20:08 +0000 |
|---|---|---|
| committer | Miles Bader | 2003-11-08 22:20:08 +0000 |
| commit | e4eaf898552db3dd02684e2f1ffe051362e11274 (patch) | |
| tree | 12c7554a5f69199a391be717ead73bfafb32d446 /lisp/language | |
| parent | cfda993e1aea9634d5efabe048b3dc366c2c7171 (diff) | |
| download | emacs-e4eaf898552db3dd02684e2f1ffe051362e11274.tar.gz emacs-e4eaf898552db3dd02684e2f1ffe051362e11274.zip | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/language')
| -rw-r--r-- | lisp/language/kannada.el | 1 | ||||
| -rw-r--r-- | lisp/language/knd-util.el | 1 |
2 files changed, 2 insertions, 0 deletions
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.")) | |||
| 43 | 43 | ||
| 44 | (provide 'kannada) | 44 | (provide 'kannada) |
| 45 | 45 | ||
| 46 | ;;; arch-tag: 880ba90b-f6f5-4131-bc1d-930705b78416 | ||
| 46 | ;;; kannada.el ends here | 47 | ;;; 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.") | |||
| 537 | 537 | ||
| 538 | (provide 'knd-util) | 538 | (provide 'knd-util) |
| 539 | 539 | ||
| 540 | ;;; arch-tag: 78d32230-a960-46a5-b622-61ed6ffcf8fc | ||
| 540 | ;;; knd-util.el ends here | 541 | ;;; knd-util.el ends here |