resolve merge conflicts

JacquesLucke · Jun 2, 2016 · a85e2e1 · a85e2e1
1 parent 1984895
commit a85e2e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/__init__.py b/__init__.py
@@ -23,8 +23,8 @@
     "name":        "Animation Nodes",
     "description": "Node based visual scripting system designed for motion graphics in Blender.",
     "author":      "Jacques Lucke",
-    "version":     (1, 5, 1),
-    "blender":     (2, 7, 7),
+    "version":     (1, 6, 0),
+    "blender":     (2, 77, 0),
     "location":    "Node Editor",
     "category":    "Node",
     "warning":     ""