[blog] 02/02: 134: add myself to authors, remove merge-conflict marker

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository blog.

commit 4ba9be8506e9052d1eee1c74803dda0ae5a07ac3
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Nov 20 17:21:00 2017 +0100

    134: add myself to authors, remove merge-conflict marker
---
 drafts/134.mdwn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drafts/134.mdwn b/drafts/134.mdwn
index 1c0e992..eb9a217 100644
--- a/drafts/134.mdwn
+++ b/drafts/134.mdwn
@@ -139,5 +139,4 @@ FIXME
 Misc.
 -----
 
-This week's edition was written by Chris Lamb & reviewed by a bunch of Reproducible Builds folks on IRC & the mailing lists.
->>>>>>> 134: Initial draft
+This week's edition was written by Chris Lamb and Ximin Luo & reviewed by a bunch of Reproducible Builds folks on IRC & the mailing lists.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/blog.git