Commit 57f2b65

committed

fix merge issue

1 parent 98ef904 commit 57f2b65Copy full SHA for 57f2b65

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,6 @@`
`20`	`20`	`"coverage": "jest src/data-structures --coverage && open coverage/lcov-report/index.html",`
`21`	`21`	`"linter": "npx eslint --fix -f codeframe src/"`
`22`	`22`	`},`
`23`		`-<<<<<<< HEAD`
`24`		`- "keywords": [],`
`25`		`- "author": "",`
`26`		`-=======`
`27`	`23`	`"keywords": [`
`28`	`24`	`"algorithms",`
`29`	`25`	`"data structures",`
`@@ -33,6 +29,5 @@`
`33`	`29`	`"binary search trees"`
`34`	`30`	`],`
`35`	`31`	`"author": "Adrian Mejia <hi+dsajs@adrianmejia.com>",`
`36`		`->>>>>>> dde5f7d... update lodash`
`37`	`32`	`"license": "ISC"`
`38`	`33`	`}`

Comments

(0)