resolve conflicts

tituscmd · tituscmd · commit 74895afb488b · 2025-05-30T23:47:07.000+02:00
diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in
@@ -53,11 +53,7 @@ namespace Pinetime {
       Terminal,
       Infineat,
       CasioStyleG7710,
-<<<<<<< HEAD
       PrimeTime,
-=======
-      Prime,
->>>>>>> ba296e3ffab1f8f87a605c2265529a69af9ac1fe
     };
 
     template <Apps>
