chore: Fix merge conflict in main.pot
This commit is contained in:
parent
fbaca7f154
commit
2ccae25bfe
@ -1857,11 +1857,7 @@ msgstr ""
|
||||
msgid "Edit Grid Row Fields Layout"
|
||||
msgstr ""
|
||||
|
||||
<<<<<<< HEAD
|
||||
#: frontend/src/components/Modals/NoteModal.vue:18
|
||||
=======
|
||||
#: frontend/src/components/Modals/NoteModal.vue:6
|
||||
>>>>>>> bf63bd54 (chore: update POT file)
|
||||
msgid "Edit Note"
|
||||
msgstr ""
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user