Fixed merge conflict

integration_tests/dockerfiles/Dockerfile_test_volume

@@ -0,0 +1,7 @@
+FROM gcr.io/google-appengine/debian9
+RUN mkdir /foo
+RUN echo "hello" > /foo/hey
+VOLUME /foo/bar /tmp
+ENV VOL /baz/bat
+VOLUME ["${VOL}"]
+RUN echo "hello again" > /tmp/hey

integration_tests/dockerfiles/config_test_run.json

@@ -14,8 +14,8 @@
         },
         {
           "Name": "/var/log/apt/term.log",
-          "Size1": 24421,
-          "Size2": 24421
+          "Size1": 23671,
+          "Size2": 23671
         },
         {
           "Name": "/var/cache/ldconfig/aux-cache",
@@ -24,8 +24,8 @@
         },
         {
           "Name": "/var/log/apt/history.log",
-          "Size1": 5415,
-          "Size2": 5415
+          "Size1": 5661,
+          "Size2": 5661
         },
         {
           "Name": "/var/log/alternatives.log",

integration_tests/dockerfiles/config_test_volume.json

@@ -0,0 +1,12 @@
+[
+  {
+    "Image1": "gcr.io/kaniko-test/docker-test-volume:latest",
+    "Image2": "gcr.io/kaniko-test/kaniko-test-volume:latest",
+    "DiffType": "File",
+    "Diff": {
+      "Adds": null,
+      "Dels": null,
+      "Mods": null
+    }
+  }
+]