From f3dd2c30249bab602567df9bc6316043fca1039a Mon Sep 17 00:00:00 2001
From: flo <florian.mosnier@laposte.net>
Date: Sun, 15 May 2016 16:29:19 +0200
Subject: [PATCH] Sources

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index efb922f..d979094 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # Sound4Calc
 
+<<<<<<< HEAD
+Make sound on your calculator Graph 75 !
+=======
 _To be written._
+>>>>>>> e657b210ac7b3a26d4f58b2c931695f5e40333dc