Fixed merge and generated a new cellblender_id.py file

mcellteam · Jan 15, 2020 · d7a7832 · d7a7832
1 parent b2cd2b5
commit d7a7832
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,3 @@ bng/net.py
 cellblender.zip
 *.pyc
 *.swp
-/cellblender_id.py
diff --git a/cellblender_id.py b/cellblender_id.py
@@ -0,0 +1 @@
+cellblender_id = '073fd9bdfd0bb614f3523f02c0f0b36d8d349aeb'
diff --git a/makefile b/makefile
@@ -12,18 +12,10 @@ UNAME_S := $(shell uname -s)
 # For example, for a link pointing into a Linux bundle: ln -s ~/src/blender/Blender-2.78c-CellBlender-linux/2.78/scripts/addons/ ~/my_cellblender_link
 # For example, for a link pointing into a MacOSX bundle: ln -s /Applications/Blender-2.78c-CellBlender/blender.app/Contents/Resources/2.78/scripts/addons/ ~/my_cellblender_link
 
-<<<<<<< HEAD
 INSTALL_DIR ?= ~/my_cellblender_link/
-=======
-INSTALL_DIR = ~/my_cellblender_link/
->>>>>>> refs/remotes/origin/master
 
 # Linux:
-<<<<<<< HEAD
 #INSTALL_DIR = ~/.config/blender/2.78/scripts/addons/
-=======
-#INSTALL_DIR = ~/.config/blender/2.76/scripts/addons/
->>>>>>> refs/remotes/origin/master
 
 # Mac:
 #INSTALL_DIR = ~/Library/Application\ Support/Blender/2.78/scripts/addons/
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,3 @@ bng/net.py @@
     cellblender.zip
     *.pyc
     *.swp
-    /cellblender_id.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		cellblender_id = '073fd9bdfd0bb614f3523f02c0f0b36d8d349aeb'