fix build

Author: tiberiuc

build/connect.js

@@ -101,8 +101,8 @@ var getEventsFromDefinition = function getEventsFromDefinition(def) {
 exports.default = function () {
   var dataOrFn = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0];
   return function (WrappedComponent) {
-    var FirebaseConnect = function (_React$Component) {
-      _inherits(FirebaseConnect, _React$Component);
+    var FirebaseConnect = function (_Component) {
+      _inherits(FirebaseConnect, _Component);
 
       function FirebaseConnect(props, context) {
         _classCallCheck(this, FirebaseConnect);
@@ -177,7 +177,7 @@ exports.default = function () {
       }]);
 
       return FirebaseConnect;
-    }(_react2.default.Component);
+    }(_react.Component);
 
     FirebaseConnect.contextTypes = {
       store: function store() {

source/connect.js

@@ -1,30 +1,19 @@
-<<<<<<< HEAD
-import React, {PropTypes} from 'react'
-=======
-import React, {Component} from 'react'
->>>>>>> cb42bba950e45b7b67bfd206c8d9f8440ce429f5
+import React, {Component, PropTypes} from 'react'
 import {watchEvents, unWatchEvents} from './actions'
 
 const defaultEvent = {
   path: '',
   type: 'value'
 }
 
-<<<<<<< HEAD
 const fixPath = (path) =>  ((path.substring(0,1) == '/') ? '': '/') + path
 
 const isEqualArrays = (a, b) => a.length == b.length && a.every((v,i) => v === b[i])
 
-=======
->>>>>>> cb42bba950e45b7b67bfd206c8d9f8440ce429f5
 const ensureCallable = maybeFn =>
   typeof maybeFn === 'function' ? maybeFn : _ => maybeFn
 
-<<<<<<< HEAD
 const flatMap = arr => (arr && arr.length) ? arr.reduce((a, b) => a.concat(b)) : []
-=======
-const flatMap = arr =>  (arr && arr.length) ? arr.reduce((a, b) => a.concat(b)) : []
->>>>>>> cb42bba950e45b7b67bfd206c8d9f8440ce429f5
 
 const createEvents = ({type, path}) => {
   switch (type) {
@@ -72,11 +61,7 @@ const getEventsFromDefinition = def => flatMap(def.map(path => {
 }))
 
 export default (dataOrFn = []) => WrappedComponent => {
-<<<<<<< HEAD
-  class FirebaseConnect extends React.Component {
-=======
   class FirebaseConnect extends Component {
->>>>>>> cb42bba950e45b7b67bfd206c8d9f8440ce429f5
 
     constructor (props, context) {
       super(props, context)
@@ -102,7 +87,6 @@ export default (dataOrFn = []) => WrappedComponent => {
       watchEvents(firebase, dispatch, this._firebaseEvents)
     }
 
-<<<<<<< HEAD
     componentWillReceiveProps(nextProps) {
       const {firebase, dispatch} = this.context.store
 
@@ -115,24 +99,17 @@ export default (dataOrFn = []) => WrappedComponent => {
 
       this._pathsToListen = newPathsToListen;
 
-=======
-    componentWillUnmount () {
-      const {firebase} = this.context.store
->>>>>>> cb42bba950e45b7b67bfd206c8d9f8440ce429f5
       unWatchEvents(firebase, this._firebaseEvents)
 
       this._firebaseEvents = getEventsFromDefinition(this._pathsToListen)
       watchEvents(firebase, dispatch, this._firebaseEvents)
     }
 
-<<<<<<< HEAD
     componentWillUnmount () {
       const {firebase} = this.context.store
       unWatchEvents(firebase, this._firebaseEvents)
     }
 
-=======
->>>>>>> cb42bba950e45b7b67bfd206c8d9f8440ce429f5
     render () {
       return (
         <WrappedComponent