search

CKGrafico / Frontend-Boilerplates

Collection of Boilerplates with ES6, Vue, React, Nuxt, TypeScript, SCSS, Nodejs. Using good practices and file structures to inspire your real projects.
https://boilerplates.js.org
MIT License
376 stars 76 forks source link

Git conflict markers in code #114

Closed mattgreenfield closed 4 years ago

mattgreenfield commented 4 years ago

Hey, I found your repo here https://github.com/vuejs/vue-router/issues/1379#issuecomment-349600928 Thanks for your help. There are some git merge conflict markers in your code. https://github.com/CKGrafico/Frontend-Boilerplates/blob/e5ba032315350eb0be0233aaaf0ec04022419599/tsconfig.json#L3

CKGrafico commented 4 years ago

shame on me I'll check asap