Fix merge conflict

4a177b6f · Heather Ellsworth · b894a542 · 4a177b6f
Commit 4a177b6f authored Aug 13, 2018 by Heather Ellsworth
--- a/Issues.rst
+++ b/Issues.rst
@@ -32,11 +32,7 @@ Issue in Librem 5 Application

 First, you will need to identify what type of application your issue is related to. There are two types of Librem 5 applications:

-<<<<<<< HEAD
 1. Base applications that the Librem 5 team has added and would have its own repository.
-=======
-1. Base applications that the Librem 5 team has added and would have its own repository
->>>>>>> e83307087c6dd5d72f44fa4c7468eaad34108cd7
 2. Other applications

 Base Applications