resolve conflicts

author Emilie <zawadzki@ircam.fr>

Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)

committer Emilie <zawadzki@ircam.fr>

Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
author Emilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
committer Emilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
diff --cc .gitignore

index fe7d7bd7d514298ddc2087b18cae018ce5df25ff,7148000d6e65b116d78765bff6a6c2df94b36960..90e84a190ecdbdc26a7be40a68d66791febeea99
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -87,5 -87,5 +87,6 @@@ $RECYCLE.BIN
   *.msp
   
   sources
+ +
   .vscode
+ 
diff --cc app/settings.py
Simple merge
author	Emilie <zawadzki@ircam.fr>
	Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
committer	Emilie <zawadzki@ircam.fr>
	Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
app/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history