Update the download link

dzimmer · Feb 4, 2014 · c52093c · c52093c
1 parent a89f09d
commit c52093c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,11 +17,7 @@ The PlanarMechanics library is an open-source Modelica library for the modelling
 
 ## Current release
 
-<<<<<<< HEAD
-Download  [PlanarMechanics Library 1.2.0 (2014-02-01)](../../archive/release.zip)
-=======
 Download  [PlanarMechanics Library 1.2.0 (2014-02-03)](../../archive/v1.2.0.zip)
->>>>>>> f8da87c2a6e99e183c326605ada0ebecdebb95ed
 
 ## License