From 82045d5f67746f00ecc5ba53db0c21c3b372567f Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Mon, 13 Feb 2023 01:10:15 +0100
Subject: [PATCH] address review comments

---
 packages/app/src/State/Login.ts | 4 ----
 packages/app/src/lang.json      | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/packages/app/src/State/Login.ts b/packages/app/src/State/Login.ts
index 5768098a..8c40c440 100644
--- a/packages/app/src/State/Login.ts
+++ b/packages/app/src/State/Login.ts
@@ -126,10 +126,6 @@ export interface LoginStore {
   latestTags: number;
 
   /**
-<<<<<<< HEAD
-
-=======
->>>>>>> e05bec8 (feat: follow tags)
    * A list of event ids this user has pinned
    */
   pinned: HexKey[];
diff --git a/packages/app/src/lang.json b/packages/app/src/lang.json
index 5dbced35..f9aaa53c 100644
--- a/packages/app/src/lang.json
+++ b/packages/app/src/lang.json
@@ -29,9 +29,6 @@
   "0yO7wF": {
     "string": "{n} secs"
   },
-  "11YZdY": {
-    "string": "Are you sure you want to unbookmark this note?"
-  },
   "1A7TZk": {
     "string": "What is Snort and how does it work?"
   },