Revised the README.md file once more

CSB-at-ZIB · Jan 24, 2013 · 26483a0 · 26483a0
1 parent c65489d
commit 26483a0
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # BioPARKIN
 ## Biology-related Parameter Identification in Large Kinetic Networks
 
@@ -69,4 +68,3 @@ Sensitivity Overview plot of all parameter/species pairs of a model.
 
 Colorized sensitivitiy values at a specific timepoint.
 
->>>>>>> b4901684a762df4f0ec0d15d588668d85bb113b0