remove merge

vietnogi · vietnogi · commit 475281b00c39 · 2016-02-01T11:17:17.000-08:00
diff --git a/src/actions/uploadToS3.js b/src/actions/uploadToS3.js
@@ -1,5 +1,4 @@
 import Q from 'q'
-export { merge } from 'lodash'
 
 export const S3_UPLOAD_REQUEST  = 'S3_UPLOAD_REQUEST'
 export const S3_UPLOAD_SUCCESS  = 'S3_UPLOAD_SUCCESS'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import Q from 'q'`
`2`		`-export { merge } from 'lodash'`
`3`	`2`
`4`	`3`	`export const S3_UPLOAD_REQUEST = 'S3_UPLOAD_REQUEST'`
`5`	`4`	`export const S3_UPLOAD_SUCCESS = 'S3_UPLOAD_SUCCESS'`