address review comments

2023-02-13 01:10:15 +01:00 · 2023-02-13 01:10:15 +01:00 · 82045d5f67
commit 82045d5f67
parent d15f2ae984
2 changed files with 0 additions and 7 deletions
--- 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[];
--- 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?"
  },