From 6dd4e2e6e439e97a64c79e08cfaa7be5ca26f151 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Fri, 18 Dec 2015 07:58:26 -0500
Subject: [PATCH] Conflict

---
 website/_config.yml                            | 1 +
 website/src/examples/dragdrop/static/js/app.js | 0
 2 files changed, 1 insertion(+)
 create mode 100644 website/src/examples/dragdrop/static/js/app.js

diff --git a/website/_config.yml b/website/_config.yml
index 5c6254e16..16feaec21 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -4,6 +4,7 @@
 
 # Uppy versions, auto updated by update.js
 uppy_version: 0.0.1
+
 uppy_dev_size: "55.95"
 uppy_min_size: "55.95"
 uppy_gz_size: "55.95"
diff --git a/website/src/examples/dragdrop/static/js/app.js b/website/src/examples/dragdrop/static/js/app.js
new file mode 100644
index 000000000..e69de29bb