Fix merge conflicts

Merge branch 'master' of github.com:lenage/react-qiniu
lenage · Sep 12, 2015 · 9d83ec4 · 9d83ec4
2 parents a59d47f + f817a60
commit 9d83ec4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/index.js b/index.js
@@ -2,7 +2,6 @@
 
 'use strict';
 var React = require('react');
-var Promise = require('bluebird');
 var request = require('superagent-bluebird-promise');
 
 var isFunction = function (fn) {
@@ -90,7 +89,7 @@ var ReactQiniu = React.createClass({
     },
 
     onClick: function () {
-        if (this.props.supportClick === true) {
+        if (this.props.supportClick) {
             this.open();
         }
     },