Merge branch 'SDR001' into test_branch

# Conflicts: # test.txt

Merge branch 'SDR001' into test_branch
# Conflicts: # test.txt
b97304b2 · Goragod · 1886bf55 · 35da2c0d · b97304b2 · b97304b2
Commit b97304b2 authored Sep 20, 2016 by Goragod
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

test.txt test.txt +2 -2

yyyy.txt yyyy.txt +2 -0

No files found.
--- a/test.txt
+++ b/test.txt
-aaaaa
\ No newline at end of file
+aaaaa
+asdfasdfasdf
--- a/yyyy.txt
+++ b/yyyy.txt
+adfsdf
\ No newline at end of file