Update readme.md

unipsycho · Dec 19, 2015 · dde5e3d · dde5e3d
1 parent 617a397
commit dde5e3d
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/readme.md b/readme.md
@@ -3,11 +3,8 @@ A very useful and easy to use data grid to replace LabVIEW's tables and multicol
 
 Basically, this grid allows better table support, with more built in features that you can use standard LabVIEW data with and basic properties to your own string data into a more friendly grid and content display.
 
-<<<<<<< HEAD
 ![Front Panel](https://github.com/unipsycho/LabVIEWdotNetDataGrid/blob/master/documentation/img/Frontpanel.png)
-=======
-![Front Panel](https://github.com/unipsycho/LabVIEWdotNetDataGrid/blob/v1.0/documentation/img/Frontpanel.png)
->>>>>>> v1.0
+
 
 #Features
 * Auto drawing and formatting of content