From 522a1eb0beaabb607b1f123993ec2f09be8a775b Mon Sep 17 00:00:00 2001
From: Jean-François Milants <jf@codingfield.com>
Date: Wed, 20 Jan 2021 21:34:09 +0100
Subject: Merge branch piggz/nav into develop:  - fix conflict  - add a icon
 for the navigation app.

---
 src/displayapp/screens/ApplicationList.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp/screens/ApplicationList.cpp')

diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 57fbde20..dd7fcd41 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -56,7 +56,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
 
 std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
   std::array<Screens::Tile::Applications, 6> applications {
-          {{Symbols::tachometer, Apps::Gauge},
+          {{Symbols::map, Apps::Navigation},
            {Symbols::asterisk, Apps::Meter},
            {Symbols::paintbrush, Apps::Paint},
                   {Symbols::info, Apps::Notifications},
-- 
cgit v1.2.3