Fix merge conflict

getkirby · Jun 29, 2024 · a76308e · a76308e
1 parent 54d20e7
commit a76308e
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/panel/src/panel/content.js b/panel/src/panel/content.js
@@ -52,14 +52,6 @@ export default (panel) => {
 		get isLocked() {
 			return this.lock?.state === "lock";
 		},
-		/**
-		 * Whether the content is currently locked by another user
-		 *
-		 * @returns {Boolean}
-		 */
-		get isLocked() {
-			return this.lock?.state === "lock";
-		},
 		/**
 		 * Content lock state of the model
 		 *