summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-libs/libical-3.0.6
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-libs/libical-3.0.6')
-rw-r--r--metadata/md5-cache/dev-libs/libical-3.0.64
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.6 b/metadata/md5-cache/dev-libs/libical-3.0.6
index ead46a59b4c5..eb860dd6e166 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.6
+++ b/metadata/md5-cache/dev-libs/libical-3.0.6
@@ -11,5 +11,9 @@ RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) introspection? ( dev-libs/glib:
REQUIRED_USE=vala? ( introspection )
SLOT=0/3
SRC_URI=https://github.com/libical/libical/releases/download/v3.0.6/libical-3.0.6.tar.gz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vala 682da46cf615b9f7a7d3680058139dcd xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vala 682da46cf615b9f7a7d3680058139dcd xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=c70b9f382a0aa59764ca5975ce964689