From: "Philip Miess" <Phil_miess@yahoo.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/user/superposition:master commit in: /
Date: Sun, 13 Aug 2017 13:53:40 +0000 (UTC) [thread overview]
Message-ID: <1502632521.1247e0b549d46eab2192dfd8c15d9adf9846b540.Phil_miess@gentoo> (raw)
commit: 1247e0b549d46eab2192dfd8c15d9adf9846b540
Author: Philip Miess <Philip_Miess <AT> yahoo <DOT> com>
AuthorDate: Sun Aug 13 13:55:21 2017 +0000
Commit: Philip Miess <Phil_miess <AT> yahoo <DOT> com>
CommitDate: Sun Aug 13 13:55:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/user/superposition.git/commit/?id=1247e0b5
:qMerge branch 'master' of git+ssh://git.gentoo.org/repo/user/superposition
dev-python/freecode-submit/Manifest | 4 ++++
dev-python/freecode-submit/freecode-submit-2.9.ebuild | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --cc dev-python/freecode-submit/Manifest
index 4419f22,9167b59..0afb5ec
--- a/dev-python/freecode-submit/Manifest
+++ b/dev-python/freecode-submit/Manifest
@@@ -1,3 -1,3 +1,7 @@@
DIST freecode-submit-2.9.tar.gz 18612 SHA256 9a07a62fc82105b9ac856946831df3083c951978fd3aee6fc161595148c25d49 SHA512 932d38bc018a3987df0daecb8cd5fbc23b8d91d349d70e457f38f80d8628e6b14cfdae93f5918e885fe35e0daf7ef55abd43a2023a8640abd0143042fbe4611b WHIRLPOOL 9bda9f369b4e73c19aaf21e5c7dee9014755e1eff2229e475b9f6bbc3ba1cb1dca716e060edd93229d52fa1bbd7ff9e5510e19c6eb84501afce7742a24e9d9f9
++<<<<<<< HEAD
+EBUILD freecode-submit-2.9.ebuild 636 SHA256 98cdba4119d6c0b3c614c1162a4cf07f7ca76dcae374cb857c0fae80ba8f1c6b SHA512 56b37bd7c7e1485207397f13f88a043cb33665cb3e9e9c69526832e22899cb33d976a1de54c1d30fbd79740a46a932aa0d2124989b2639ca86f21dd85b13df10 WHIRLPOOL d86021b5b14918ec5ad2d70a5ac966027fc58384a4fdf23d803365a79c3e9ed4c33a1dcfe041321797e6968f9bfb1a24834a918ae68e7670ee1b2292cad11f87
++=======
+ EBUILD freecode-submit-2.9.ebuild 640 SHA256 29c2c3a17005184f3875b34de0ac0ffd8ced74ffce5a19a6d4268942ae6fe70f SHA512 814f17928d140d3b3002c16365f2f705035f94661f28ba52e3dbea4e6db6557e9b939aa388cfd86010a2d57fc8bb48b56b62a1418bfd2732da4701b2432f39fa WHIRLPOOL 2862973ff9573fff8e7a8be75dde4a198a627d073000c6ab873107c13eae7a8d039a4dbce06823205f6a9173f03c5bf12594b3075f7ebbec3357c6c0156dd310
++>>>>>>> 28720a0ce4d65277d3a70222d45efbb378d7adda
MISC metadata.xml 715 SHA256 d1160f48274cade505c09173bc35efa57edf7e66ae673c9b5faca1f7a2c45bd1 SHA512 eef55fce9ecb88e0f7830d5329f24932541e2a818e89ca53d73e18889acd5d7326acc035789e76ccc4fdc4d230f40431426e22670f062360de0fa5df8d8efd8c WHIRLPOOL a26fe4341ec80077a116540b2c30bc50abfcaf68e2e357cc26030ebb0993897e924cf9623d7df0246a892eb13d1e2ce09b1b45220b8c6ec794c0b4f077034c2a
next reply other threads:[~2017-08-13 13:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-13 13:53 Philip Miess [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-10-26 1:32 [gentoo-commits] repo/user/superposition:master commit in: / Philip Miess
2019-11-02 23:40 Philip Miess
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1502632521.1247e0b549d46eab2192dfd8c15d9adf9846b540.Phil_miess@gentoo \
--to=phil_miess@yahoo.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox