summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-lua/lgi-0.9.0-r1')
-rw-r--r--metadata/md5-cache/dev-lua/lgi-0.9.0-r14
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.0-r1 b/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
index 720b19d06a8f..1e975826f2b3 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
@@ -9,5 +9,9 @@ LICENSE=MIT
RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi:0=
SLOT=0
SRC_URI=https://github.com/pavouk/lgi/archive/0.9.0.tar.gz -> lgi-0.9.0.tar.gz
+<<<<<<< HEAD
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462
+=======
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462
+>>>>>>> next
_md5_=2d28f0fa41f4de0b0337dae36f9634f3