Delete README.rst.orig

diff --git a/README.rst.orig b/README.rst.orig
deleted file mode 100644 (file)
index 7c6d786..0000000
--- a/README.rst.orig
+++ /dev/null
@@ -1,55 +0,0 @@
-Lain
-====
-
---------------------------------------------------
-Layouts, widgets and utilities for Awesome WM 3.5+
---------------------------------------------------
-
-:Author: Luke Bonham <dada [at] archlinux [dot] info>
-:Version: git
-<<<<<<< HEAD
-:License: GNU-GPLv2_
-=======
-:License: GNU-GPL2_
->>>>>>> upstream/master
-:Source: https://github.com/copycat-killer/lain
-
-Description
------------
-
-Successor of awesome-vain_, this module provides new layouts, a set of widgets and utility functions, in order to improve Awesome_ usability and configurability.
-
-Read the wiki_ for all the info.
-
-Contributions
--------------
-
-Any contribution is welcome! Feel free to make a pull request.
-
-Just make sure that:
-
-- Your code fits with the general style of the module. In particular, you should use the same indentation pattern that the code uses, and also avoid adding space at the ends of lines.
-
-- Your code its easy to understand, maintainable, and modularized. You should also avoid code duplication wherever possible by adding functions or using ``lain.helpers``. If something is unclear, and you can't write it in such a way that it will be clear, explain it with a comment.
-
-- You test your changes before submitting to make sure that not only your code works, but did not break other parts of the module too!
-
-- You eventually update ``wiki`` submodule with a thorough section.
-
-Contributed widgets have to be put in ``lain/widgets/contrib``.
-
-Screenshots
------------
-
-.. image:: http://i.imgur.com/8D9A7lW.png
-.. image:: http://i.imgur.com/9Iv3OR3.png
-.. image:: http://i.imgur.com/STCPcaJ.png
-
-<<<<<<< HEAD
-.. _GNU-GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
-=======
-.. _GNU-GPL2: http://www.gnu.org/licenses/gpl-2.0.html
->>>>>>> upstream/master
-.. _awesome-vain: https://github.com/vain/awesome-vain
-.. _Awesome: http://awesome.naquadah.org/
-.. _wiki: https://github.com/copycat-killer/lain/wiki