diff options
Diffstat (limited to 'metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178')
| -rw-r--r-- | metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 index 7a14336f34f9..21da079ad2b6 100644 --- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 +++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 @@ -11,5 +11,9 @@ RDEPEND=http? ( net-misc/curl:= ) polly? ( media-sound/pulseaudio ) ssl? ( !libr REQUIRED_USE=python_targets_python2_7 SLOT=0 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.7.178.tar.gz -> aws-sdk-cpp-1.7.178.tar.gz +<<<<<<< HEAD _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2319f580c7d49061078711209160b58b |