stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

solve a remaining merge conflict in the readme

Browse Source
This commit is contained in:
Johann Dreo 2013-01-17 11:29:55 +01:00
parent 209f9765d7
commit 1826cfa007
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

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