From 3eba27bb341f3c77b49ea09510f938e8409d179e Mon Sep 17 00:00:00 2001
From: Weiwei Zhang <weiwzhang@berkeley.edu>
Date: Mon, 27 Feb 2017 09:00:49 -0800
Subject: [PATCH] prep merging upstream

---
 src/cesium                        | 1 +
 src/pip-delete-this-directory.txt | 5 +++++
 webpack.config.js                 | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 src/cesium
 create mode 100644 src/pip-delete-this-directory.txt

diff --git a/src/cesium b/src/cesium
new file mode 160000
index 0000000..9976707
--- /dev/null
+++ b/src/cesium
@@ -0,0 +1 @@
+Subproject commit 99767072da84edaa691b2022fe45f98e20275160
diff --git a/src/pip-delete-this-directory.txt b/src/pip-delete-this-directory.txt
new file mode 100644
index 0000000..c8883ea
--- /dev/null
+++ b/src/pip-delete-this-directory.txt
@@ -0,0 +1,5 @@
+This file is placed here by pip to indicate the source was put
+here by pip.
+
+Once this package is successfully installed this source code will be
+deleted (unless you remove this file).
diff --git a/webpack.config.js b/webpack.config.js
index 8e4f25d..8967fe7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -41,7 +41,7 @@ const config = {
     }),
   ],
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: ['.js', '.jsx']
   }
 };