From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:prefix commit in: pym/portage/
Date: Sat, 10 Dec 2011 12:06:20 +0000 (UTC) [thread overview]
Message-ID: <97ad87a656c26e93f3d4d51776dfb9e7533c7d25.grobian@gentoo> (raw)
commit: 97ad87a656c26e93f3d4d51776dfb9e7533c7d25
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 12:06:09 2011 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 12:06:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=97ad87a6
remove conflict marker
---
pym/portage/dispatch_conf.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 11a6a7d..88ed222 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -42,7 +42,6 @@ def diffstatusoutput_len(cmd):
def read_config(mandatory_opts):
eprefix = EPREFIX
config_path = os.path.join(eprefix or os.sep, "etc/dispatch-conf.conf")
->>>>>>> overlays-gentoo-org/master
loader = KeyValuePairFileLoader(config_path, None)
opts, errors = loader.load()
if not opts:
next reply other threads:[~2011-12-10 12:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-10 12:06 Fabian Groffen [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-18 19:46 [gentoo-commits] proj/portage:prefix commit in: pym/portage/ Fabian Groffen
2017-12-12 8:13 Fabian Groffen
2013-01-27 21:51 Fabian Groffen
2012-10-02 11:59 Fabian Groffen
2012-09-30 11:10 Fabian Groffen
2012-09-30 11:10 Fabian Groffen
2012-03-01 20:32 Fabian Groffen
2012-01-18 7:58 Fabian Groffen
2011-12-14 15:29 Fabian Groffen
2011-12-10 12:55 Fabian Groffen
2011-12-10 12:12 Fabian Groffen
2011-12-09 20:39 Fabian Groffen
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=97ad87a656c26e93f3d4d51776dfb9e7533c7d25.grobian@gentoo \
--to=grobian@gentoo.org \
--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