Fix merge issues.

bradfordlemley · bradfordlemley · commit 77ef27c1c22a · 2018-10-10T10:48:32.000-06:00
diff --git a/packages/babel-plugin-named-asset-import/package.json b/packages/babel-plugin-named-asset-import/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "babel-plugin-named-asset-import",
+  "name": "@bradfordlemley/babel-plugin-named-asset-import",
   "version": "0.2.2",
   "description": "Babel plugin for named asset imports in Create React App",
   "repository": "facebookincubator/create-react-app",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "babel-plugin-named-asset-import",`
	`2`	`+ "name": "@bradfordlemley/babel-plugin-named-asset-import",`
`3`	`3`	`"version": "0.2.2",`
`4`	`4`	`"description": "Babel plugin for named asset imports in Create React App",`
`5`	`5`	`"repository": "facebookincubator/create-react-app",`