cms
cms copied to clipboard
.gitignore for JetBrains IDE
Added rules in .gitignore to ignore JetBrains IDE like PhpStorm.
This stuff should all be in your global gitignore
https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
This is a simple accept. Is this project not alive anymore?
Merge conflict exists.