Preparing to merge develop.. Some weird GIT stuff prevents a clean merge

sys-bio · Dec 11, 2013 · fa9a245 · fa9a245
1 parent 68a48fe
commit fa9a245
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 230 deletions.
diff --git a/Authors.txt b/Authors.txt
diff --git a/COPYING.txt b/COPYING.txt
diff --git a/Funding.txt b/Funding.txt
diff --git a/License.txt b/License.txt
diff --git a/News.txt b/News.txt
diff --git a/Notice.txt b/Notice.txt
diff --git a/Readme.txt b/Readme.txt
diff --git a/Version.txt b/Version.txt