gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove merge-relicts from Manifest

Browse Source
This commit is contained in:
Micha Glave 2013-05-23 23:38:18 +02:00
parent fab41f58b5
commit f15cbd59dc
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev-java/plantuml/Manifest
View File

@ -1,7 +1,2 @@
<<<<<<< local
DIST plantuml-7965.tar.gz 843549 SHA256 a7e3e7e78dedb229b5c929fc533502b59a898745ce705cd2a44126b615a0e3ff SHA512 83b4114d84c5703427d714fdbb11fceafae3a3bdbeabdb1a5be908ea90850b922d67deb02daf17f3592d28bd0fbe37c29cb65176b33b6e32a9f60d985c390c96 WHIRLPOOL ccd29a378403258444be21e4c3cb1669b4ea6cf959fe5eae876c2eb94a5bb6ea315c4879074dff65a70c578baa04713e3e8057203b9ecdd1ed7692864c45b258
EBUILD plantuml-7965.ebuild 730 SHA256 6b20d17147958ea165ff0ba7302edbe2a40c2bd041ba59f0022b86bd77f3e558 SHA512 7ab1537a40d3da0c0d481ef721351fae2fba8696d5c4b62c63a0d0502409533c77eccf73eeffec8726bbbf3439ed265431a798659cbeef4974656c83db6d5606 WHIRLPOOL 4efb352bd0a82adf40cbb52ad8645c4f9c03fbd30739547a3a6ae6de7071adacf591dab3a799b0f893887f324915fdd8d1732d9df14fc7f7cbdd92f950ce7cb9
=======
DIST plantuml-7967.tar.gz 847528 SHA256 d39ff987e1716f57aca38bd53ffa7c231a9e3788e26a5f8ca1980b91c25dabed SHA512 0d35b6b7d9c700be984abac71c3c2598863d0bab2a3f2d6d5ddb587ba6b6811ed6231f6a1dca2eddbab2a6db8682c0cb7cf038a4df10e3c8d307959be3845b44 WHIRLPOOL d036b27c3eceb760671edd7dd2de383ccbf09308d19124d5d212d43c2d72cb4e5686b57a72662c4555ce68fea8056d2af0b6a85fcecdfa860d9e887ca7b9d96e DIST plantuml-7967.tar.gz 847528 SHA256 d39ff987e1716f57aca38bd53ffa7c231a9e3788e26a5f8ca1980b91c25dabed SHA512 0d35b6b7d9c700be984abac71c3c2598863d0bab2a3f2d6d5ddb587ba6b6811ed6231f6a1dca2eddbab2a6db8682c0cb7cf038a4df10e3c8d307959be3845b44 WHIRLPOOL d036b27c3eceb760671edd7dd2de383ccbf09308d19124d5d212d43c2d72cb4e5686b57a72662c4555ce68fea8056d2af0b6a85fcecdfa860d9e887ca7b9d96e
EBUILD plantuml-7967.ebuild 730 SHA256 6b20d17147958ea165ff0ba7302edbe2a40c2bd041ba59f0022b86bd77f3e558 SHA512 7ab1537a40d3da0c0d481ef721351fae2fba8696d5c4b62c63a0d0502409533c77eccf73eeffec8726bbbf3439ed265431a798659cbeef4974656c83db6d5606 WHIRLPOOL 4efb352bd0a82adf40cbb52ad8645c4f9c03fbd30739547a3a6ae6de7071adacf591dab3a799b0f893887f324915fdd8d1732d9df14fc7f7cbdd92f950ce7cb9 EBUILD plantuml-7967.ebuild 730 SHA256 6b20d17147958ea165ff0ba7302edbe2a40c2bd041ba59f0022b86bd77f3e558 SHA512 7ab1537a40d3da0c0d481ef721351fae2fba8696d5c4b62c63a0d0502409533c77eccf73eeffec8726bbbf3439ed265431a798659cbeef4974656c83db6d5606 WHIRLPOOL 4efb352bd0a82adf40cbb52ad8645c4f9c03fbd30739547a3a6ae6de7071adacf591dab3a799b0f893887f324915fdd8d1732d9df14fc7f7cbdd92f950ce7cb9
>>>>>>> other