Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

2 files changed, 3 insertions, 2 deletions

diff --git a/backend/api/api/Controllers/FileController.cs b/backend/api/api/Controllers/FileController.cs
index 0be480f2..a5d0ae7e 100644
--- a/backend/api/api/Controllers/FileController.cs
+++ b/backend/api/api/Controllers/FileController.cs
@@ -121,9 +121,9 @@ namespace api.Controllers
 
 
             if (hasHeader)
-                return String.Join("", System.IO.File.ReadLines(filePath).Take(11)); 
+                return String.Join("\n", System.IO.File.ReadLines(filePath).Take(11)); 
             else 
-                return String.Join("", System.IO.File.ReadLines(filePath).Take(10));
+                return String.Join("\n", System.IO.File.ReadLines(filePath).Take(10));
         }
 
 
diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs
index 12dcfa08..47814449 100644
--- a/backend/api/api/Models/Dataset.cs
+++ b/backend/api/api/Models/Dataset.cs
@@ -25,6 +25,7 @@ namespace api.Models
         public bool hasHeader { get; set; }
 
         public ColumnInfo[] columnInfo { get; set; }
+        public int rowCount { get; set; }
         public int nullCols { get; set; }
         public int nullRows { get; set; }
         public bool isPreProcess { get; set; }