diff options
Diffstat (limited to 'metadata/md5-cache/app-editors/emacs-25.3-r6')
| -rw-r--r-- | metadata/md5-cache/app-editors/emacs-25.3-r6 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6 index 8dabf0dc8a61..988dba924a08 100644 --- a/metadata/md5-cache/app-editors/emacs-25.3-r6 +++ b/metadata/md5-cache/app-editors/emacs-25.3-r6 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=25 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz +<<<<<<< HEAD _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=7973e5fc40afb8a3b03a6c58cf20a121 |