deleted react-select from dropdown file

starkspark · starkspark · commit df2332c389b3 · 2019-07-31T14:55:18.000-04:00
diff --git a/package.json b/package.json
@@ -53,12 +53,7 @@
     "react-dom": "^16.8.6",
     "react-json-tree": "^0.11.2",
     "react-router-dom": "^5.0.1",
-<<<<<<< HEAD
-    "react-test-renderer": "^16.8.6",
-    "redux-devtools-themes": "^1.0.0",
-=======
     "react-select": "^3.0.4",
->>>>>>> c2249dad99b74725bef4d439c547588aa9d654ae
     "sass": "^1.22.7"
   }
 }
diff --git a/src/app/components/Dropdown.jsx b/src/app/components/Dropdown.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import Select from 'react-select';
 import PropTypes from 'prop-types';
 
 const Dropdown = (props) => {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import React from 'react';`
`2`		`-import Select from 'react-select';`
`3`	`2`	`import PropTypes from 'prop-types';`
`4`	`3`
`5`	`4`	`const Dropdown = (props) => {`