diff options
| author | Marius Peter <blendoit@gmail.com> | 2019-06-06 17:14:46 -0700 |
|---|---|---|
| committer | Marius Peter <blendoit@gmail.com> | 2019-06-06 17:14:46 -0700 |
| commit | 715b605b51cdc1fd1257e700394101fda0aafd55 (patch) | |
| tree | 0e9114692028236b0e97eb6bb57e296c68255bfa /__init__.py | |
| parent | eb79ba668ac40a0e698bf99e4589b5d7ea6d9e80 (diff) | |
| parent | 4f2f9b29b0863fa670cd889f20f3c5ba76a1b80b (diff) | |
Merge branch 'master' of https://github.com/Blendoit/UCLA_MAE_154B
Diffstat (limited to '__init__.py')
| -rw-r--r-- | __init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/__init__.py b/__init__.py index 274be56..1521839 100644 --- a/__init__.py +++ b/__init__.py @@ -13,7 +13,12 @@ # 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
|