From: Emilie <zawadzki@ircam.fr>
Date: Fri, 8 Dec 2017 14:58:25 +0000 (+0100)
Subject: resolve conflicts
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ec4b9022fd7ab98837b65dfb2e7d4a59cf424f9f;p=mezzo.git

resolve conflicts
---

ec4b9022fd7ab98837b65dfb2e7d4a59cf424f9f
diff --cc .gitignore
index fe7d7bd7,7148000d..90e84a19
--- a/.gitignore
+++ b/.gitignore
@@@ -87,5 -87,5 +87,6 @@@ $RECYCLE.BIN
  *.msp
  
  sources
 +
  .vscode
+