__title__ = "eemeter"
__description__ = "Open Energy Efficiency Meter"
__url__ = "http://github.com/openeemeter/eemeter"
<<<<<<< HEAD
__version__ = "2.1.4"
=======
__version__ = "2.1.3"
>>>>>>> 24f2ecbc763a1aa1c73b4829882a2ca4e3429707
__author__ = "Phil Ngo"
__author_email__ = "admin@openee.io"
__license__ = "Apache 2.0"
__copyright__ = "Copyright 2017-2018 Open Energy Efficiency, Inc."

@@ -118,21 +118,8 @@
 er%22%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 __ve
@@ -140,87 +140,8 @@
 .4%22%0A
-=======%0A__version__ = %222.1.3%22%0A%3E%3E%3E%3E%3E%3E%3E 24f2ecbc763a1aa1c73b4829882a2ca4e3429707%0A
 __au

Fix conflicts