prep merging upstream

weiwzhang · Feb 27, 2017 · 3eba27b · 3eba27b
1 parent 5c06f9a
commit 3eba27b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/cesium b/src/cesium
diff --git a/src/pip-delete-this-directory.txt 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
@@ -41,7 +41,7 @@ const config = {
     }),
   ],
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: ['.js', '.jsx']
   }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ const config = { @@
         }),
       ],
       resolve: {
-        extensions: ['', '.js', '.jsx']
+        extensions: ['.js', '.jsx']
       }
     };
@@ Expand Down @@