Skip to content

Commit

Permalink
Merge branch 'new-feature' into using-merge-no-ff
Browse files Browse the repository at this point in the history
change
  • Loading branch information
jklmli committed Mar 17, 2017
2 parents 3ba30a3 + b836de0 commit 93f6de5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions file1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sub-change 1
sub-change 3
2 changes: 2 additions & 0 deletions file2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sub-change 1
sub-change 2
2 changes: 2 additions & 0 deletions file3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sub-change 2
sub-change 3

0 comments on commit 93f6de5

Please sign in to comment.