Commit 4a177b6f authored by Heather Ellsworth's avatar Heather Ellsworth
Browse files

Fix merge conflict

parent b894a542
Pipeline #658 passed with stage
in 51 seconds
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment