Skip to content
Snippets Groups Projects
Commit 0a7545db authored by Juliette Engelaere-Lefebvre's avatar Juliette Engelaere-Lefebvre
Browse files

fix conflict, vraiment

parent adf78bf1
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
.gitignore
+ 0
− 4
View file @ 0a7545db
......@@ -5,10 +5,6 @@
*.csv
*.RData
*.ods
<<<<<<< HEAD
*.xls
_book/
book_files/
=======
*.wav
>>>>>>> 0961578af74f0eddd52008aff2bc6188b678fec4
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment