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=8e58c525f5bf2f0c0b10927ae220b69a61b1bd60;p=mezzo.git

resolve conflicts
---

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