cleared conflict with git ignore

beta
Ro 3 years ago
parent de2aec58c9
commit 2fdd7f40f0

3
.gitignore vendored

@ -15,9 +15,10 @@ public/assets/css/*
!public/assets/css/dash.css !public/assets/css/dash.css
!public/assets/scripts !public/assets/scripts
public/assets/scripts/* public/assets/scripts/*
!public/assets/scripts/dash.min.js !public/assets/scripts/Start.js
/public/assets/images/global/rikc-logo.svg /public/assets/images/global/rikc-logo.svg
!public/assets/images !public/assets/images
public/assets/images/* public/assets/images/*
!public/assets/images/global/ !public/assets/images/global/

Loading…
Cancel
Save