diff --git a/bin/tests/scenarios/incorrect_merge_conflict/base.java b/bin/tests/scenarios/incorrect_merge_conflict/base.java index 0aa1066..fd94228 100644 --- a/bin/tests/scenarios/incorrect_merge_conflict/base.java +++ b/bin/tests/scenarios/incorrect_merge_conflict/base.java @@ -12,4 +12,4 @@ protected void wrapUp(GHRepository[] page) { } }; } -} \ No newline at end of file +} diff --git a/bin/tests/scenarios/incorrect_merge_conflict/left.java b/bin/tests/scenarios/incorrect_merge_conflict/left.java index e1b5516..2535508 100644 --- a/bin/tests/scenarios/incorrect_merge_conflict/left.java +++ b/bin/tests/scenarios/incorrect_merge_conflict/left.java @@ -13,4 +13,4 @@ protected void wrapUp(GHRepository[] page) { } }; } -} \ No newline at end of file +} diff --git a/bin/tests/scenarios/incorrect_merge_conflict/merge.java b/bin/tests/scenarios/incorrect_merge_conflict/merge.java index a18e334..570aaf4 100644 --- a/bin/tests/scenarios/incorrect_merge_conflict/merge.java +++ b/bin/tests/scenarios/incorrect_merge_conflict/merge.java @@ -4,4 +4,5 @@ public class Main { public static void main ( ) { return ======= retrieve ( ) . with ( "since" , since ) . asPagedIterable ( "/repositories" , GHRepository [ ] . class , item -> item . wrap ( GitHub . this ) ) >>>>>>> - ; } } \ No newline at end of file + ; } } + \ No newline at end of file diff --git a/bin/tests/scenarios/incorrect_merge_conflict/right.java b/bin/tests/scenarios/incorrect_merge_conflict/right.java index b9793a4..3895e71 100644 --- a/bin/tests/scenarios/incorrect_merge_conflict/right.java +++ b/bin/tests/scenarios/incorrect_merge_conflict/right.java @@ -6,4 +6,4 @@ public static void main() { GHRepository[].class, item -> item.wrap(GitHub.this) ); } -} \ No newline at end of file +}