mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
Resolve CVS conflicts
This commit is contained in:
parent
cfda993e1a
commit
e4eaf89855
@ -43,4 +43,5 @@ environment."))
|
||||
|
||||
(provide 'kannada)
|
||||
|
||||
;;; arch-tag: 880ba90b-f6f5-4131-bc1d-930705b78416
|
||||
;;; kannada.el ends here
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user