From dde5e3d330378801b41a00fd3128b2e726e2b2a3 Mon Sep 17 00:00:00 2001 From: Mike King Date: Sat, 19 Dec 2015 15:13:39 -0700 Subject: [PATCH] Update readme.md --- readme.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/readme.md b/readme.md index fef2528..2a758f7 100644 --- 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