Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014

poneill00 · Jan 30, 2014 · 8ccd8e9 · 8ccd8e9
2 parents ebe740b adf963b
commit 8ccd8e9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 0 deletions.
diff --git a/branchFile.txt b/branchFile.txt
@@ -0,0  1 @@
 this is in another branch
diff --git a/coolfile.txt b/coolfile.txt
@@ -16,3  16,4 @@ Some random text: 26551
 Some random text: 26551
 Some random text: 26551
 postscript
 A random update
diff --git a/myfile.txt b/myfile.txt
@@ -0,0  1 @@
 my test data
diff --git a/newfunfile.txt b/newfunfile.txt
@@ -0,0  1 @@
 this is a fun new file
diff --git a/owls.txt b/owls.txt
@@ -0,0  1,2 @@
 The owl and the pussy cat
 went to sea
diff --git a/sample1.txt b/sample1.txt
@@ -1  1,4 @@
 random stuffs: 7854
 
 
 yipeee
diff --git a/story1.txt b/story1.txt
@@ -1  1,2 @@
 Some new random text: 17058
 Some more random text: 555555
Original file line number	Diff line number	Diff line change
		@@ -1 1,2 @@
		Some new random text: 17058
		Some more random text: 555555