fix merge conflicts with PR JedWatson#2174

looks like I missed this one line after reviewing my diff

remove dist
restore old dist

revert this
Merge remote-tracking branch 'origin/master'

.gitignore

@@ -26,3 +26,7 @@ bower_components
 .DS_Store
 .env
 yarn.lock
+
+# v2 ignores
+.NOTES.md
+.TODO.md

HISTORY.md

@@ -1,5 +1,12 @@
 # React-Select
 
+## v1.2.1 / 2018-01-13
+
+* Fixed blocking the Del key when deleteRemoves is false, thanks [Nachtigall, Jens (init)](https://github.com/jnachtigall) - [see PR](https://github.com/JedWatson/react-select/pull/2291)
+* Fixed inline-block rendering for arrowRenderer without autosize, thanks [Harry Kao](https://github.com/harrykao) - [see PR](https://github.com/JedWatson/react-select/pull/2276)
+* Fixed dropdown menu positioning issues in IE 11, thanks [jharris4](https://github.com/jharris4) - [see PR](https://github.com/JedWatson/react-select/pull/2273)
+* Added missing rule to the `scss` stylesheet, thanks [Jordan Whitfield](https://github.com/mantissa7) - [see PR](https://github.com/JedWatson/react-select/pull/2280)
+
 ## v1.2.0 / 2018-01-08
 
 * Source cleanup, thanks to [Yuri S](https://github.com/yuri-sakharov) and

README.md

@@ -66,8 +66,8 @@ class App extends React.Component {
     console.log(`Selected: ${selectedOption.label}`);
   }
   render() {
-  	const { selectedOption } = this.state;
-  	const value = selectedOption && selectedOption.value;
+    const { selectedOption } = this.state;
+    const value = selectedOption && selectedOption.value;
 
     return (
       <Select

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "react-select",
   "main": ["dist/react-select.min.js", "dist/react-select.min.css"],
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/JedWatson/react-select",
   "authors": ["Jed Watson"],
   "description": "A Select control built with and for ReactJS",