robot.txt
[auf_rh_dae.git] / .gitignore
index 51ce3bd..cb060fe 100644 (file)
@@ -32,3 +32,8 @@ tmp
 
 # extra
 project/media_prive/*
+<<<<<<< HEAD
+project/static/*
+=======
+project/static
+>>>>>>> master