From 1826cfa0073f5e98540dd771df9f6c94393cc922 Mon Sep 17 00:00:00 2001
From: Johann Dreo <johann.dreo@thalesgroup.com>
Date: Thu, 17 Jan 2013 11:29:55 +0100
Subject: [PATCH] solve a remaining merge conflict in the readme

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 6c11519..43fc23d 100644
--- a/README.md
+++ b/README.md
@@ -272,9 +272,6 @@ the display of the liquid prompt.
 * Subversion repository cannot display commits to be pushed, this is a
 limitation of the Subversion versionning model.
 * The proxy detection only uses the `$http_proxy` environment variable.
-<<<<<<< HEAD
 * The window's title escape sequence may not work properly on some terminals
 (like xterm-256)
 
-=======
->>>>>>> 3aedf713f42fcfa91a1eba5cd4b4dbc36a59ee58