From e464eb69ed9aa22361a7abc4a4b7695bc3ec0f18 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 8 Aug 2017 09:18:24 +0100
Subject: [PATCH] fix #193

Former-commit-id: 5765a9c1178a015e036481e6eb78f498bead5b04 [formerly 37680ed0dab2e85b3ac921fbe3fd354a238211f5] [formerly ed9fbac269e054784e5f375c71c6423441667e82 [formerly e42ec4b42fb3e5e9641f3405c93596b62edf7a61]]
Former-commit-id: 5877cfd762b4dc1e6924ae87f136f24c82a98fdc [formerly 65376cc4c37750b9e7efdfae8fe24687a683d057]
Former-commit-id: 4063ea78f117a8e3d04a047280e8462c6d5d493e
---
 assets/src/components/files/Listing.vue | 4 ++++
 rice-box.go.REMOVED.git-id              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/src/components/files/Listing.vue b/assets/src/components/files/Listing.vue
index cb4e818d..5878b95e 100644
--- a/assets/src/components/files/Listing.vue
+++ b/assets/src/components/files/Listing.vue
@@ -275,6 +275,10 @@ export default {
       this.checkConflict(files, this.req.items, base)
     },
     checkConflict (files, items, base) {
+      if (typeof items === 'undefined' || items === null) {
+        items = []
+      }
+
       let conflict = false
       for (let i = 0; i < files.length; i++) {
         let res = items.findIndex(function hasConflict (element) {
diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id
index 7d218215..1f0e95ec 100644
--- a/rice-box.go.REMOVED.git-id
+++ b/rice-box.go.REMOVED.git-id
@@ -1 +1 @@
-089544d63f4f1d633c2e2baa961a8958d1d768e4
\ No newline at end of file
+1f3ae0f4595621cd6a7492418bafc23660342685
\ No newline at end of file