Remove knausj conflict

pokey · pokey · commit edfcdb5be703 · 2021-12-17T13:15:40.000Z
diff --git a/src/actions/actions.py b/src/actions/actions.py
@@ -72,7 +72,7 @@ def vscode_command(command_id: str, target: dict, arguments: dict = {}):
     "swap_action": {"swap": "swapTargets"},
     "move_bring_action": {"bring": "replaceWithTarget", "move": "moveToTarget"},
     "wrap_action": {"wrap": "wrapWithPairedDelimiter", "repack": "rewrap"},
-    "insert_snippet_action": {"snip": "insertSnippet"},
+    "insert_snippet_action": {"snippet": "insertSnippet"},
     "reformat_action": {"format": "applyFormatter"},
 }
 
diff --git a/src/snippets.py b/src/snippets.py
@@ -105,4 +105,4 @@ def on_ready():
     )
 
 
-app.register("ready", on_ready)
+app.register("ready", on_ready)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def vscode_command(command_id: str, target: dict, arguments: dict = {}):`
`72`	`72`	`"swap_action": {"swap": "swapTargets"},`
`73`	`73`	`"move_bring_action": {"bring": "replaceWithTarget", "move": "moveToTarget"},`
`74`	`74`	`"wrap_action": {"wrap": "wrapWithPairedDelimiter", "repack": "rewrap"},`
`75`		`- "insert_snippet_action": {"snip": "insertSnippet"},`
	`75`	`+ "insert_snippet_action": {"snippet": "insertSnippet"},`
`76`	`76`	`"reformat_action": {"format": "applyFormatter"},`
`77`	`77`	`}`
`78`	`78`