forked from projects/fipamo
cleared conflict with git ignore
This commit is contained in:
parent
de2aec58c9
commit
2fdd7f40f0
1 changed files with 2 additions and 1 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -15,9 +15,10 @@ public/assets/css/*
|
|||
!public/assets/css/dash.css
|
||||
!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
|
||||
public/assets/images/*
|
||||
!public/assets/images/global/
|
||||
|
|
Loading…
Reference in a new issue