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/icons/navigation/new | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/displayapp/icons/navigation/new

(limited to 'src/displayapp/icons/navigation/new')

diff --git a/src/displayapp/icons/navigation/new b/src/displayapp/icons/navigation/new
new file mode 100644
index 00000000..7e1cd6c7
--- /dev/null
+++ b/src/displayapp/icons/navigation/new
@@ -0,0 +1,8 @@
+    {
+        LV_IMG_CF_INDEXED_1BIT,
+        0,
+        0,
+        64,
+        64
+    },
+    520,
-- 
cgit v1.2.3