summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/games-action/minetest-5.0.1-r3
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/games-action/minetest-5.0.1-r3')
-rw-r--r--metadata/md5-cache/games-action/minetest-5.0.1-r34
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/games-action/minetest-5.0.1-r3 b/metadata/md5-cache/games-action/minetest-5.0.1-r3
index e75f4690a766..674694939aa8 100644
--- a/metadata/md5-cache/games-action/minetest-5.0.1-r3
+++ b/metadata/md5-cache/games-action/minetest-5.0.1-r3
@@ -11,5 +11,9 @@ RDEPEND=dev-db/sqlite:3 dev-games/irrlicht dev-libs/gmp:0= dev-libs/jsoncpp:= sy
REQUIRED_USE=|| ( client server )
SLOT=0
SRC_URI=https://github.com/minetest/minetest/archive/5.0.1.tar.gz -> minetest-5.0.1.tar.gz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=50a538e6f9015830b7fc126882cf6205