Unresolved git diffs in master branch

ratiw / vuetable-2-tutorial

MIT License

258 stars 67 forks source link

Open erikjmiller opened 6 years ago

erikjmiller commented 6 years ago

Hello I just did a fresh clone, yarn and got an error from yarn.

There are many unresolved git conflicts in the yarn file that prevented it from running.