diff options
| author | Marius Peter <blendoit@gmail.com> | 2019-06-06 17:15:17 -0700 |
|---|---|---|
| committer | Marius Peter <blendoit@gmail.com> | 2019-06-06 17:15:17 -0700 |
| commit | f2d1b535bb5bbcdeca2f8b1cacb60374d312f50d (patch) | |
| tree | 208e43dea9dec9a7991f4874dcf4429606918109 | |
| parent | 715b605b51cdc1fd1257e700394101fda0aafd55 (diff) | |
update
| -rw-r--r-- | __init__.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/__init__.py b/__init__.py index 1521839..3330885 100644 --- a/__init__.py +++ b/__init__.py @@ -13,12 +13,5 @@ # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
__author__ = "Marius Peter"
-<<<<<<< HEAD
-__version__ = "2.1"
-__revision__ = "2.1.1"
-
-qwqw
-=======
__version__ = "2.3"
__revision__ = "2.3.1"
->>>>>>> 4f2f9b29b0863fa670cd889f20f3c5ba76a1b80b
|