From 90d3b8949e18da78f6526c6e522de32a466a0162 Mon Sep 17 00:00:00 2001
From: evilhero <evilhero@gmail.com>
Date: Wed, 19 Mar 2014 13:58:28 -0400
Subject: [PATCH] FIX: incorrect branch set during last merge

---
 mylar/version.py      | 2 +-
 mylar/versioncheck.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mylar/version.py b/mylar/version.py
index 1dba1859..d6fc5bd3 100755
--- a/mylar/version.py
+++ b/mylar/version.py
@@ -1 +1 @@
-MYLAR_VERSION = "development"
+MYLAR_VERSION = "master"
diff --git a/mylar/versioncheck.py b/mylar/versioncheck.py
index f8ed7ec4..e45ca765 100755
--- a/mylar/versioncheck.py
+++ b/mylar/versioncheck.py
@@ -21,7 +21,7 @@ from mylar import logger, version
 import lib.simplejson as simplejson
 
 user = "evilhero"
-branch = "development"
+branch = "master"
 
 def runGit(args):