Solved merge conflict

2026-04-26 05:58:48 -05:00 · 2016-06-13 13:25:03 -04:00
parent 661dd00129 db9af4c886
commit 3e034b73bb
12 changed files with 155 additions and 342 deletions
@@ -156,7 +156,7 @@ std::vector<float*> DataProcessorText::processData(std::string data, properties:
            if(line.find("#") == 0) continue;

            values = std::vector<float>();
-
+            
            int first = 0; 
            int last = 0;
            int option = -3;