Merge branch 'hotfix' into recrutement
[auf_rh_dae.git] / .gitignore
index cb060fe..4f906f0 100644 (file)
@@ -32,8 +32,4 @@ tmp
 
 # extra
 project/media_prive/*
-<<<<<<< HEAD
 project/static/*
-=======
-project/static
->>>>>>> master