32423

ba1e58f0 · 叶海龙 · 37a5e47a · ba1e58f0 · ba1e58f0
Commit ba1e58f0 authored Feb 19, 2019 by 叶海龙
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 6 deletions

Program.cs myProject/Program.cs +5 -3

Program.cs.orig myProject/Program.cs.orig +10 -3

No files found.
--- a/myProject/Program.cs
+++ b/myProject/Program.cs
@@ -44,11 +44,13 @@ namespace myProject
 		}
-<<<<<<< HEAD
 		public void delete3()
-=======
+		{
+		}
 		public void delete2()
->>>>>>> m101_bugfix
 		{
 		}

--- a/myProject/Program.cs.orig
+++ b/myProject/Program.cs.orig
@@ -35,16 +35,23 @@ namespace myProject
 			}
 		}
-<<<<<<< HEAD
+		public void add()
+		{
+		}
 		public void update()
 		{
 		}
+<<<<<<< HEAD
+		public void delete3()
 =======
-		public void add()
+		public void delete2()
+>>>>>>> m101_bugfix
 		{
 		}
->>>>>>> m101_bugfix
 	}
 }