Remove conflict marker.
[emacs.git] / admin / 
tree545cb8029420eb4879937eb930f7b337d3b2694d
drwxr-xr-x   ..
-rw-r--r-- 2325 ChangeLog
-rw-r--r-- 791 README
-rw-r--r-- 3339 admin.el
-rw-r--r-- 2618 alloc-colors.c
-rwxr-xr-x 2374 build-configs
-rwxr-xr-x 8880 check-doc-strings
-rwxr-xr-x 1265 diff-tar-files
-rw-r--r-- 17922 emacs-pretesters
-rwxr-xr-x 4613 make-emacs
drwxr-xr-x - notes
drwxr-xr-x - nt
-rwxr-xr-x 8151 quick-install-emacs
-rwxr-xr-x 3064 revdiff