Fixing conflict in StreetView.js from recent merge

cmv · Oct 28, 2015 · 0203941 · 0203941
1 parent f04d63e
commit 0203941
Showing 1 changed file with 1 addition and 22 deletions.
diff --git a/viewer/js/gis/dijit/StreetView.js b/viewer/js/gis/dijit/StreetView.js
@@ -1,7 +1,6 @@
 /*global google */
 /*eslint strict: 0*/
 define([
-<<<<<<< HEAD
     'dojo/_base/declare',
     'dijit/_WidgetBase',
     'dijit/_TemplatedMixin',
@@ -18,28 +17,8 @@ define([
     'esri/geometry/Point',
     'esri/SpatialReference',
     'dijit/MenuItem',
-    '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.3/proj4.js',
+    '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.12/proj4.js',
     'dojo/i18n!./StreetView/nls/resource',
-=======
-	'dojo/_base/declare',
-	'dijit/_WidgetBase',
-	'dijit/_TemplatedMixin',
-	'dijit/_WidgetsInTemplateMixin',
-	'dojo/_base/lang',
-	'dojo/aspect',
-	'dojo/topic',
-	'esri/layers/GraphicsLayer',
-	'esri/graphic',
-	'esri/renderers/SimpleRenderer',
-	'dojo/text!./StreetView/templates/StreetView.html',
-	'esri/symbols/PictureMarkerSymbol',
-	'dojo/dom-style',
-	'esri/geometry/Point',
-	'esri/SpatialReference',
-	'dijit/MenuItem',
-	'//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.12/proj4.js',
-	'dojo/i18n!./StreetView/nls/resource',
->>>>>>> develop
 
     'dijit/form/Button',
     'xstyle/css!./StreetView/css/StreetView.css',