diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-09-18 16:47:55 +0200 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-09-18 17:21:58 +0200 |
| commit | 6a8fea365b64584ed09e53975e9f95a3b60ad377 (patch) | |
| tree | c21b1845700f1a422961147717a29a38bb8167d1 | |
| parent | ccpn update (diff) | |
| download | sci-6a8fea365b64584ed09e53975e9f95a3b60ad377.tar.gz sci-6a8fea365b64584ed09e53975e9f95a3b60ad377.tar.bz2 sci-6a8fea365b64584ed09e53975e9f95a3b60ad377.zip | |
Manifest fix
| -rw-r--r-- | sci-chemistry/ccpn/Manifest | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest index eac316d90..cadb4712a 100644 --- a/sci-chemistry/ccpn/Manifest +++ b/sci-chemistry/ccpn/Manifest @@ -7,6 +7,11 @@ AUX pipe2azara 321 RMD160 c6ca09d178507af6dd2bff4bc8ad6765f4586b62 SHA1 96900b02 DIST analysis2.0.7.1.tar.gz 18142642 RMD160 b345c8c8a3cbee549f0ddffbe76d208aa0a93b42 SHA1 f1cade41ce9d488926873bbc6f83fa79af7d9623 SHA256 8d37aa12a3e18a875dcce8689751144c5a949e3431395d00fdef49fbbb0f4d69 DIST analysis2.1.0.tar.gz 18962012 RMD160 3997fe7deafd50142f60d036e82f436519efe1d0 SHA1 df86d54a13fa1c955f47889f1310b62edfd9dc09 SHA256 132ab4a39fdeedde24385b0c976adea43efd512fefcff7dd973790e9faaf9d95 EBUILD ccpn-2.0.7.1-r2.ebuild 4550 RMD160 4adb7d8e25ae01b7c390475fa253e3408425e5fd SHA1 a177bc13e9f9da9f82e86acc6579ef3d11d227ff SHA256 e7f5ad42f1a095259c37ce9a6fe45a462fd105971b90719b3ad66cebe7e82865 +<<<<<<< HEAD:sci-chemistry/ccpn/Manifest EBUILD ccpn-2.1.0-r1.ebuild 4020 RMD160 266630e5c59e305654c8945de40cf5505b054b13 SHA1 4b9922f385b8df068f37fbdbb5c1c5828ef086c9 SHA256 21dd4e262ddd5c361900828561f20aa0777895d5a2c9f35d4d72f4208c39cb09 +======= +EBUILD ccpn-2.1.0-r1.ebuild 4021 RMD160 3d0b8a96d6d1532dd170458ba2e83e54a4b04c52 SHA1 7fe09a6f08130004cbc66dcfa7598567f8a77181 SHA256 1a833d927ab2e1064f2579908453996c0c85302d2eaf77e06fe40121ce2bbde1 +EBUILD ccpn-2.1.0.ebuild 4546 RMD160 86a4d9260ca3aa7a401e5b311bc336794d14f311 SHA1 1220889c05b6e9ba814ffa32d83360ed3eccf471 SHA256 afc425f1e75a995322972a51f899d52d69610953d5e59cdb968277695b54ab87 +>>>>>>> Manifest fix:sci-chemistry/ccpn/Manifest MISC ChangeLog 3319 RMD160 d6edf93c4b7738600640a1497ccd4198291b2306 SHA1 432d135a08b5833d14678229af67ee174f28f1f9 SHA256 64019e9ff1f1bbd5ac6460f50da1ba51dd10c4fad718ce3353187f2642ace041 MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec |