failed merged now fixed

LydByDissing · Jul 11, 2022 · 5170f9f · 5170f9f
1 parent 2b01cdf
commit 5170f9f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -14,11 +14,8 @@ The *Strøm* open source speaker project have been started with the main goal of
   user-documentation/index
   repair
   end-of-life
-<<<<<<< HEAD
   speaker/index
   software/index
-=======
->>>>>>> 71d5f7664e155b94b3970c8661792f65731da612
   contributing
   license
   todo