提交到master

9d4f0727 · 万凯 · bb79556b · 9d4f0727 · 9d4f0727
Commit 9d4f0727 authored Jun 12, 2019 by 万凯
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

opk.txt opk.txt +0 -4

opk.txt.rej opk.txt.rej +8 -0

No files found.
--- a/opk.txt
+++ b/opk.txt
@@ -2,7 +2,3 @@ just do it
 what is the meaning


-ioi
-ss
-
-
--- a/opk.txt.rej
+++ b/opk.txt.rej
+diff a/opk.txt b/opk.txt	(rejected hunks)
+@@ -3,4 +3,6 @@
+ 
+ 
+ ioi
+ss
+
+