Resolve merge conflicts

Merge branch 'master' of https://github.com/j6k4m8/neuromorpholib
aplbrain · Aug 27, 2018 · a0a6fab · a0a6fab
2 parents 172dd69 + 08a704e
commit a0a6fab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 # Created by https://www.gitignore.io/api/node,code,macos,python
 
 ### Code ###

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
     version=__version__,
     description='Library for manipulating neuromorpho resources.',
     long_description=long_description,
-    # download_url='https://github.com/jhuapl-boss/intern/tarball/' + __version__,
+    download_url='https://github.com/j6k4m8/neuromorpholib/tarball/' + __version__,
     license='Apache 2.0',
     classifiers=[
       'Development Status :: 4 - Beta',
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		# Created by https://www.gitignore.io/api/node,code,macos,python

		### Code ###
Expand Down