ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-27 00:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/remove-componentWillUpdate

Browse Source 
Conflicts:
	src/components/map/MapboxGlMap.jsx
	src/components/modals/ExportModal.jsx
This commit is contained in:
orangemug
2018-09-10 14:46:52 +01:00
parent 409f81f0d8 7e5fb4d42f
commit 26ff9f63bb
43 changed files with 277 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/map/OpenLayers3Map.jsx
View File

@@ -1,7 +1,5 @@
import React from 'react'
import PropTypes from 'prop-types'
import style from '../../libs/style.js'
import isEqual from 'lodash.isequal'
import { loadJSON } from '../../libs/urlopen'
import 'ol/ol.css'