summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n/nabi/Manifest')
-rw-r--r--app-i18n/nabi/Manifest6
1 files changed, 4 insertions, 2 deletions
diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
index 4fb93c56867b..60ee0954c38c 100644
--- a/app-i18n/nabi/Manifest
+++ b/app-i18n/nabi/Manifest
@@ -1,3 +1,5 @@
+<<<<<<< Manifest
+MD5 547c3f699834d617c991e7c06c7defdd nabi-0.9.ebuild 973
+MD5 7a3e785e5a228270709a9964b6d07609 ChangeLog 429
+=======
MD5 88636e2a25efee048c2be3aa29615f75 nabi-0.9.ebuild 974
-MD5 6249dc47c56f3dc76c1dd95683226058 files/digest-nabi-0.9 60
-MD5 c709f2e7898d2173d3b68f84b3e9c65d ChangeLog 312