From 12f69ca8c4d5c3fae754ad93669ecc49ee1a66aa Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Tue, 29 Sep 2015 22:25:33 +1000 Subject: [PATCH] revert --- README.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/README.md b/README.md index 42cbdda..7a847d5 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,3 @@ -<<<<<<< HEAD -## Downloads -- [Mangle for Windows](ftp://foosoft.net/releases/mangle/mangle_win.zip) -- [Mangle for MacOS (Old)](ftp://foosoft.net/releases/mangle/mangle_osx.zip) - -## For Developers -- [Python 2.7](http://www.python.org/download/releases/2.7/) -- [Python Image Library (PIL)](http://www.pythonware.com/products/pil/) -- [PyQT4](http://www.riverbankcomputing.com/software/pyqt/download) -- [ReportLab](https://pypi.python.org/pypi/reportlab) -- [natsort](https://pypi.python.org/pypi/natsort/3.0.1) -- [py2exe](http://www.py2exe.org/) (optional, for Windows distribution only) ======= # Mangle # @@ -106,4 +94,3 @@ its place. Linux users should execute the Python scripts with the interpreter an * [magnle_win.zip](http://dl.foosoft.net/mangle/mangle_win.zip) * [mangle_osx.zip](http://dl.foosoft.net/mangle/mangle_osx.zip) ->>>>>>> cedfe3fc512a8f58680d8fa0618143d423c3112d