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

---
 CHANGELOG.md | 1 -
 README.md    | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 8337473..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1 +0,0 @@
-_No published version yet._
diff --git a/README.md b/README.md
index d979094..7685518 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,2 @@
-# Sound4Calc
 
-<<<<<<< HEAD
-Make sound on your calculator Graph 75 !
-=======
-_To be written._
->>>>>>> e657b210ac7b3a26d4f58b2c931695f5e40333dc
+Make sound on your Casio calculator Graph 75 !