summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3')
-rw-r--r--metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.39
1 files changed, 9 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
index 6bb30c3aa70c..91bd9b34949e 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
@@ -1,6 +1,10 @@
BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
DEFINED_PHASES=compile configure install prepare test
+<<<<<<< HEAD
DEPEND=dev-libs/aws-c-common
+=======
+DEPEND=dev-libs/aws-c-common dev-libs/aws-checksums
+>>>>>>> next
DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
EAPI=7
HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
@@ -9,5 +13,10 @@ KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.1.3.tar.gz -> aws-c-event-stream-0.1.3.tar.gz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5ac1b5042797c7d213b0c426153c1c54
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=a3391b493790e101cbfb87187a089ea1
+>>>>>>> next