Merge branch 'master' of ghevar:/data/subha/git_cortical

Conflicts: dataviz/probabilities.py
subhacom · Apr 6, 2012 · 781e420 · 781e420
2 parents ca37425 + 21e6dac
commit 781e420
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/probabilities.py b/probabilities.py
@@ -6,13 +6,17 @@
 # Maintainer: 
 # Created: Mon Mar 19 23:25:51 2012 (+0530)
 # Version: 
+<<<<<<< HEAD
 # Last-Updated: Fri Apr  6 13:08:00 2012 (+0530)
+=======
+# Last-Updated: Fri Apr  6 12:33:07 2012 (+0530)
+>>>>>>> fdedd22ccb84331bf944e52e994278a24375eba4
 #           By: subha
 #     Update #: 1702
 # URL: 
 # Keywords: 
 # Compatibility: 
-# 
+#  
 # 
 
 # Commentary: