Fix #318 Fixed merge conflicts

matthiasmullie / minify

CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.

https://matthiasmullie.github.io/minify/

MIT License

1.97k stars 309 forks source link

Fix #318 Fixed merge conflicts #409

Closed mbuella closed 1 year ago

mbuella commented 1 year ago

This is the work by @timhunt with PR Fix #317 handling of preserved comments in CSS, with merge conflicts fixed.

timhunt commented 1 year ago

@mbuella Thanks for sorting out the merge issue on my branch. I hope you success in progressing this.

matthiasmullie commented 1 year ago

Thanks for the contributions, @timhunt and @mbuella, and my apologies for not looking at this earlier!