angular-cms icon indicating copy to clipboard operation
angular-cms copied to clipboard

README.md file contain merging conflict code

Open labsterx opened this issue 10 years ago • 1 comments

In the README.md file, there're characters that might be resulted from merging conflicts:

Line 80: <<<<<<< HEAD

Line 86: ======= $ sh ./bin/db.sh >>>>>>> fe4af0e14ef3596c823d4777d672ba00406ddb90

labsterx avatar Dec 17 '14 07:12 labsterx

I will fix this, thanks

jonniespratley avatar Dec 17 '14 16:12 jonniespratley