123

# Conflicts:
#	doc/123.txt

1.txt

@@ -1,3 +1,4 @@
 111
 branch1
-branch2
+branch2
+pull request

doc/123.txt

@@ -0,0 +1 @@
+123

src/animal.java

@@ -0,0 +1,4 @@
+public  abstract class animal {//abstract class
+    public double weight;
+    public abstract void eat();//abstract method
+    }