[Python-checkins] test: Test conflict resolution on push, just in case

[chris.angelico]

https://hg.python.org/test/rev/c26bf6513876
changeset:   220:c26bf6513876
user:        Chris Angelico <rosuav at gmail.com>
date:        Sun Dec 07 03:44:02 2014 +1100
summary:
  Test conflict resolution on push, just in case

files:
  Lenalede |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lenalede b/Lenalede
--- a/Lenalede
+++ b/Lenalede
@@ -11,3 +11,5 @@
 Lenalede your city of free will, giving zones to citizens meriting?
 .........:.................:..............................:.....................
 
+Originally from Camembert Canyon Campaign.
+

-- 
Repository URL: https://hg.python.org/test