Add merge conflict intentionally

tlinjordet · Jun 30, 2021 · 546a0df · 546a0df
1 parent 4bab7f2
commit 546a0df
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/python/example_script.py b/python/example_script.py
@@ -20,6 +20,8 @@
 import json
 import typing
 
+def merge_conflict_function():
+    pass
 
 def dummy_line_modification(line: str, i: int, mods: typing.Dict[str, dict]) -> str:
     """Defines the modification to be perfomed for a single input line.