Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
Conflicts: .gitignore deleted: .gitignore
This commit is contained in:
commit
4daf5c5b64
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,7 +0,0 @@
|
||||
*.log
|
||||
*.dvi
|
||||
*.gz
|
||||
*.toc
|
||||
*.aux
|
||||
*.lof
|
||||
*.pdf
|
Reference in New Issue
Block a user