Fix merge conflicts3.

guzman-raphael · guzman-raphael · commit 6f9ef911420d · 2019-08-22T11:49:00.000-05:00
diff --git a/+tests/TestConnection.m b/+tests/TestConnection.m
@@ -9,4 +9,5 @@ function testConnection(testCase)
                 testCase.CONN_INFO.user,...
                 testCase.CONN_INFO.password,'',true).isConnected);
         end
-    end
+    end
+end
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.m~
 mym/
 *.mltbx
+*.env

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 *.m~
 mym/
 *.mltbx
 +*.env