summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 0 insertions, 4 deletions
diff --git a/README.md b/README.md
index 3a940b3..046c2e7 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,6 @@
```
# Initial clone with submodules
git clone https://github.com/Audiokinetic-Automotive/afb-audiohighlevel.git
-<<<<<<< HEAD
-cd afb-audiohighlevel
-=======
->>>>>>> 8a584f01b46d251fdc5de8b071eff755d99f0090
```