summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1')
-rw-r--r--metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r14
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1 b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1
index 4deaa25ec0d6..0d58dd5ea679 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1
@@ -9,5 +9,9 @@ LICENSE=BSD
RDEPEND=~net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0=
SLOT=0
SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=89a5ca4e528ca1c0e3776b79440396a8