diff options
| author |   Kent Fredric <kentfredric@gmail.com> | 2010-08-10 06:07:54 +1200 |
|---|---|---|
| committer | Kent Fredric <kentfredric@gmail.com> | 2010-08-10 06:07:54 +1200 |
| commit | eb6255ef0c84fb94600d7b1e81155ff382d7f420 (patch) | |
| tree | 3fe388cfff500591ecdbe837b279b7db9ddeb331 /dev-perl/Cache-Ref | |
| parent | KiokuDB::Backend::DBI : Bumped to 1.15. Note: some nasty hackery inside. (diff) | |
| download | perl-overlay-eb6255ef0c84fb94600d7b1e81155ff382d7f420.tar.gz perl-overlay-eb6255ef0c84fb94600d7b1e81155ff382d7f420.tar.bz2 perl-overlay-eb6255ef0c84fb94600d7b1e81155ff382d7f420.zip | |
Fixing merge mashups
Diffstat (limited to 'dev-perl/Cache-Ref')
| -rw-r--r-- | dev-perl/Cache-Ref/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-perl/Cache-Ref/Manifest | 27 | ||||
| -rw-r--r-- | dev-perl/Cache-Ref/metadata.xml | 5 |
3 files changed, 0 insertions, 38 deletions
diff --git a/dev-perl/Cache-Ref/ChangeLog b/dev-perl/Cache-Ref/ChangeLog index 1a6178510..b871dd716 100644 --- a/dev-perl/Cache-Ref/ChangeLog +++ b/dev-perl/Cache-Ref/ChangeLog @@ -4,13 +4,7 @@ *Cache-Ref-0.02 (09 Aug 2010) -<<<<<<< HEAD 09 Aug 2010; Michele Beltrame <m@cattlegrid.info> +Cache-Ref-0.02.ebuild, +metadata.xml: Initial -======= - 09 Aug 2010; Kent Fredric <kentfredric@gmail.com> +Cache-Ref-0.02.ebuild, - +metadata.xml: - Added. ->>>>>>> ff1768d5ecab86578d70d4a693563b9767911877 diff --git a/dev-perl/Cache-Ref/Manifest b/dev-perl/Cache-Ref/Manifest index 7e682a084..06de49655 100644 --- a/dev-perl/Cache-Ref/Manifest +++ b/dev-perl/Cache-Ref/Manifest @@ -1,31 +1,4 @@ -<<<<<<< HEAD DIST Cache-Ref-0.02.tar.gz 27433 RMD160 d62a4c968baa27c23c57c79257110e6998618afa SHA1 54fb183804de145a20e0f09592eea92f953ace3d SHA256 10ed5152e780e5dfb70214df85c6e263abcfa0c9635e8836d2aa2338c7aac54b EBUILD Cache-Ref-0.02.ebuild 524 RMD160 e980e518c0a6c001c4af870e00c5cf92a7117c1e SHA1 4e40af15fa84cafaa3b8c32893a351daaf4dfd92 SHA256 2ddafae23302e0a3c43755c283d44e872dca420d2cf0a53a09a9bb43b059a5ac MISC ChangeLog 254 RMD160 d624b5aed0469800123bf62e9f24c9adbd208b21 SHA1 9d1fc2cb8e13d10ad8ec70497047054113a06811 SHA256 1487adf6684118a31fc4511c8fb5590e6a4068f17736748e5d4a80ca4cd024f8 MISC metadata.xml 272 RMD160 95ea03757bc58123240ccbec8a25e8059c4629a3 SHA1 af4dc347a6df9d700c25712c373094c789dc434a SHA256 db4d1b1f5b8cf1d87af4f748df9031b48283ee4ee73bd500c51ba5582a122599 -======= ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST Cache-Ref-0.02.tar.gz 27433 RMD160 d62a4c968baa27c23c57c79257110e6998618afa SHA1 54fb183804de145a20e0f09592eea92f953ace3d SHA256 10ed5152e780e5dfb70214df85c6e263abcfa0c9635e8836d2aa2338c7aac54b -EBUILD Cache-Ref-0.02.ebuild 638 RMD160 86de08e0ceb7cd70a25f49f7588cc12b76ee5193 SHA1 3820d182ea6929de837e2acd667071b48374ebaa SHA256 e1890a183704f0c43f5e740de17972c7290bbe29b697a9cdc7bc7e90e75e12c0 -MISC ChangeLog 253 RMD160 5b8a03246355d63eedaabb9d32c33bbc557da958 SHA1 ebfd637a250e71707e40e6a79863b709c64f27ab SHA256 dd43dd98f52c6959d63015eac76ad1eb6123bb37ca6cfd01b4d460394db7cdc4 -MISC metadata.xml 275 RMD160 d7980d8f5e665a018b30c566bba02d451db23047 SHA1 a7a485be470b9fbb06c3ce88dffce811ffce282c SHA256 45455d078243c6abc929fd08947c2728292cb506ca452ab4ec33221cd7cb6f6c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iQIcBAEBAgAGBQJMYC2JAAoJECvPD7taxqSkXbAQAKAUGudCpCNwmY2pOAj/fcXI -KHwboaYq/yDrDc3XEuLUvEdUBHtKI6d/lkMzkHUH1zY1CoplIAM08i6mQ7vnaJj1 -o8nUturzGJSwzc7w1xuGgwb0likVQRyQ/3ZTNm/RXz+BOxaR6DQQ1aBcMzbqBA+T -xnJoZadV/gSdSVHzdywVdeKWbF9tIXHbCy/OXuZwEL7e27jo1Yl8rZZ9RY/y2W5Q -nE2TqZyGUMmBQBBPMngOYGC3VhtSHsN+4u8QUietpc3TES90s+hm3CkLiK1i9jIg -CUKxf3stRpEZD/IxaZf1z1zBz791LXp/J44VQgdYobL/1uUtmGK9ylcsrGD0DEMq -crgI6PDLeAHDen8Bl98hIJTHx/A1ydRR60urqEbL+6lFVNhAJEqV18SeRERUM8cx -ZuQYeQVj/1+yupcWWZdcmLY1/IRMqF8Ew2vcJrUgtRDBKophMePF6FeSzlsAOIME -gMndVcQIdPfqO5AdQBpuN/p8qblPZ82om+T/+KQN8UURPPbjpXQcOOnEiLaBkCjV -8V8bzzyWol9FsY/GkPKYPNqJLdRt1UdoAUg6JGsVK8paWdVxL1Qx+j3XDsZQsVUA -y9fr/P398VOurxPuYltunJPJdzY1LwuYEDY57w4YSkrkIfqtjfirsUO1LISCY8YI -0ShDWZVIy+8JNxT5XHRv -=cqWz ------END PGP SIGNATURE----- ->>>>>>> ff1768d5ecab86578d70d4a693563b9767911877 diff --git a/dev-perl/Cache-Ref/metadata.xml b/dev-perl/Cache-Ref/metadata.xml index 93cafa11b..7946d0904 100644 --- a/dev-perl/Cache-Ref/metadata.xml +++ b/dev-perl/Cache-Ref/metadata.xml @@ -3,12 +3,7 @@ <pkgmetadata> <herd>perl</herd> <maintainer> -<<<<<<< HEAD <email>mb@italpro.net</email> <name>Michele Beltrame</name> -======= - <email>kentfredric@gmail.com</email> - <name>Kent Fredric</name> ->>>>>>> ff1768d5ecab86578d70d4a693563b9767911877 </maintainer> </pkgmetadata> |