Updated the src/displayapp/screens/ApplicationsList.h to match the ne…

…west 1.14 ApplicationsList.h file.

src/displayapp/screens/ApplicationList.h

@@ -38,27 +38,8 @@ namespace Pinetime {
 
         static constexpr int appsPerScreen = 6;
 
-        static constexpr int nScreens = UserAppTypes::Count > 0 ? (UserAppTypes::Count - 1) / appsPerScreen + 1 : 1;
+        static constexpr int nScreens = (UserAppTypes::Count/appsPerScreen)+1;
 
-/*<<<<<<< HEAD
-=======
-        static constexpr std::array<Tile::Applications, appsPerScreen * nScreens> applications {{
-          {Symbols::stopWatch, Apps::StopWatch},
-          {Symbols::clock, Apps::Alarm},
-          {Symbols::hourGlass, Apps::Timer},
-          {Symbols::shoe, Apps::Steps},
-          {Symbols::heartBeat, Apps::HeartRate},
-          {Symbols::music, Apps::Music},
-
-          {Symbols::paintbrush, Apps::Paint},
-          {Symbols::paddle, Apps::Paddle},
-          {"2", Apps::Twos},
-          {Symbols::drum, Apps::Metronome},
-          {Symbols::map, Apps::Navigation},
-          {Symbols::calendar, Apps::Calendar},
-          // {"M", Apps::Motion},
-        }};
->>>>>>> calendar_pr/rebase_calendar*/
         ScreenList<nScreens> screens;
       };
     }