wuxiaowen
/
7.15_cangku
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'fenzhi2' into fenzhi3 

# Conflicts:
#	.gitignore
#	hello.txt
fenzhi3
Wuxiaowen 4 weeks ago
parent
c132246b1c 2d256c7ab3
commit
793250fb26
3 changed files with 6 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -0
      .gitignore
  2. +1
    -0
      1.txt
  3. +1
    -1
      hello.txt

+ 4
- 0
.gitignore View File

@@ -1 +1,5 @@
<<<<<<< HEAD
*.txt
=======
*.txt
>>>>>>> fenzhi2

+ 1
- 0
1.txt View File

@@ -0,0 +1 @@
111

+ 1
- 1
hello.txt View File

@@ -1,2 +1,2 @@
hello
3
2

Write Preview
Loading…
Cancel
Save