resolves conflicts

1 files changed, 21 insertions, 0 deletions

diff --git a/src/displayapp/screens/PassKey.h b/src/displayapp/screens/PassKey.h
new file mode 100644
index 00000000..16e72a3c
--- /dev/null
+++ b/src/displayapp/screens/PassKey.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Screen.h"
+#include <lvgl/lvgl.h>
+
+namespace Pinetime {
+  namespace Applications {
+    namespace Screens {
+
+      class PassKey : public Screen {
+      public:
+        PassKey(DisplayApp* app, uint32_t key);
+        ~PassKey() override;
+
+      private:
+        lv_obj_t* passkeyLabel;
+        lv_obj_t* backgroundLabel;
+      };
+    }
+  }
+}