diff --git a/ui/content/tab_storage.html b/ui/content/tab_storage.html index 90c75b95dba..f11ad64b1ef 100644 --- a/ui/content/tab_storage.html +++ b/ui/content/tab_storage.html @@ -611,7 +611,11 @@
Name
+<<<<<<< HEAD
+======= +
+>>>>>>> 418f895... Issue #: 5986
Type
@@ -631,7 +635,7 @@
Size
-
+
State
@@ -703,7 +707,11 @@
Name
+<<<<<<< HEAD
+======= +
+>>>>>>> 418f895... Issue #: 5986
Type
@@ -723,7 +731,7 @@
size
-
+
state