From 546a0df729a2c83c6691c58235c86721ebe4d2af Mon Sep 17 00:00:00 2001 From: Trond Linjordet Date: Wed, 30 Jun 2021 15:08:12 +0200 Subject: [PATCH] Add merge conflict intentionally --- python/example_script.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/example_script.py b/python/example_script.py index d9236f1..01210f4 100644 --- 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.