search

grevory / angular-local-storage

An AngularJS module that gives you access to the browsers local storage with cookie fallback
Other
2.83k stars 585 forks source link

bower package min file contains merge error tags #353

Closed egorov closed 7 years ago

egorov commented 7 years ago

Hi, There is broken angular-local-storage.min.js file in dist folder of last bower package. It contains git merge tags like this:

/**
 * An Angular module that gives you access to the browsers local storage
<<<<<<< HEAD
 * @version v0.5.2 - 2016-09-28
 * @link https://github.com/grevory/angular-local-storage
 * @author grevory <greg@gregpike.ca>
 * @license MIT License, http://www.opensource.org/licenses/MIT
 */

//# sourceMappingURL=angular-local-storage.min.js.map
=======
 * @version v0.1.5 - 2015-01-28
 * @link https://github.com/grevory/angular-local-storage
 * @author grevory <greg@gregpike.ca>
 * @license MIT License, http://www.opensource.org/licenses/MIT

>>>>>>> ec3e609916307f2da82c6714c37bee754e1d10b6
grevory commented 7 years ago

Strange, I don't see it. I rebuilt the dist files since they looked a version behind. Try now and let me know.

mrjoeman1 commented 7 years ago

I have this problem with merge now. Problem is actual

grevory commented 7 years ago

I see it. Looks like a problem with when I added the tag. Try now.

mrjoeman1 commented 7 years ago

Yes, thx. Problem is fixed, min file is ok

grevory commented 7 years ago

Sorry about the trouble.