aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Yan2012-05-22 17:08:06 -0500
committerLei Yan2012-05-22 17:08:06 -0500
commit4ef5b0dea46f1b25b8c9c605a76daf08190b4364 (patch)
tree30290c78016bbd52a57143f8b49294298dada8b0
parent41fb0a63a715ec0fd7d610c14cab67eeeeb597ea (diff)
parent24334b8053eb46e1337699134f79f602e74ca267 (diff)
downloadgenenetwork2-4ef5b0dea46f1b25b8c9c605a76daf08190b4364.tar.gz
Merge branch 'master' of github.com:genenetwork/genenetwork
Conflicts: .gitignore
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e69de29b..5767fde7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# gitignore
+*.pyc