after this,we will do some conflicts test

twtfnswc · Sep 16, 2014 · 60f66b8 · 60f66b8
1 parent f712901
commit 60f66b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Email.Class.php b/Email.Class.php
@@ -0,0 +1,5 @@
+<?php
+	class DoChangedName(){
+		echo 'hello world';
+	}
+?>
diff --git a/mastera.txt b/mastera.txt
@@ -0,0 +1 @@
+gg