diff options
Diffstat (limited to 'metadata/md5-cache/x11-apps/rgb-1.0.6')
| -rw-r--r-- | metadata/md5-cache/x11-apps/rgb-1.0.6 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.6 b/metadata/md5-cache/x11-apps/rgb-1.0.6 index 5defd7468e7e..48cc8526b9b8 100644 --- a/metadata/md5-cache/x11-apps/rgb-1.0.6 +++ b/metadata/md5-cache/x11-apps/rgb-1.0.6 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/rgb-1.0.6.tar.bz2 +<<<<<<< HEAD _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=78e2fcefc6dbd2c438d6de582b63b380 |