From 8e059a07a90c0ee34add32de9e74f36aebf366e3 Mon Sep 17 00:00:00 2001
From: Cedric CAFFY <cedric.caffy@cern.ch>
Date: Wed, 20 Nov 2019 15:23:59 +0100
Subject: [PATCH] Fixed other merge conflicts
---
disk/DiskSystemTest.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/disk/DiskSystemTest.cpp b/disk/DiskSystemTest.cpp
index 2cb30ea19e..f4e79f7ad1 100644
--- a/disk/DiskSystemTest.cpp
+++ b/disk/DiskSystemTest.cpp
@@ -157,5 +157,6 @@ namespace unitTests {
ASSERT_EQ(2,ex.m_failedDiskSystems.size());
}
ASSERT_EQ(200,diskSystemFreeSpaceList.at(constantFreeSpaceDiskSystem.name).freeSpace);
+
}
-}
\ No newline at end of file
+}
--
GitLab