From de83398f56bb67471e64c736515ea4f5ac7ad5d0 Mon Sep 17 00:00:00 2001
From: filoe <florian.rosmann@gmail.com>
Date: Thu, 4 Jun 2015 14:04:41 +0200
Subject: [PATCH] Fixed merge mistakes.

---
 CSCore/IWaveAggregator.cs | 13 -------------
 README.md                 |  3 ---
 2 files changed, 16 deletions(-)
 delete mode 100644 CSCore/IWaveAggregator.cs

diff --git a/CSCore/IWaveAggregator.cs b/CSCore/IWaveAggregator.cs
deleted file mode 100644
index c78b8a8a..00000000
--- a/CSCore/IWaveAggregator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace CSCore
-{
-     /// <summary>
-     ///     Defines the base interface for any <see cref="IWaveSource" /> aggregators.
-     /// </summary>
-     public interface IWaveAggregator : IWaveSource
-     {
-         /// <summary>
-         ///     Gets the underlying <see cref="IWaveSource" />.
-         /// </summary>
-         IWaveSource BaseStream { get; }
-     }
- }
\ No newline at end of file
diff --git a/README.md b/README.md
index d5fb3182..03e3f33d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
-<<<<<<< HEAD
 ![CSCore Logo](http://fs1.directupload.net/images/150528/h8n8qwyc.png)
 
 
-=======
->>>>>>> version_1_1
 # CSCore - .NET Audio Library #
 
 CSCore is a free .NET audio library which is completely written in C#. Although it is still a rather young project, it offers tons of features like playing or capturing audio, en- or decoding many different codecs, effects and much more!