Skip to content

Commit fbfe155

Browse files
committed
resolved conflict after a revert
1 parent e07e832 commit fbfe155

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/Test

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
Test in feature again feature 2 - Submitting this for the PR conversations
2-
3-
Another unwanted feature 2 change
4-
5-
Another commit on top of feature2
2+
Another commit on top of feature2

0 commit comments

Comments
 (0)