testing2
/
repo-forking-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new conflict

This commit is contained in:
testing2 2023-04-18 10:52:39 +03:00
parent 271715951d
commit 54b510cf34
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file-main
View File

@ -11,7 +11,7 @@ main file code
4 4
3 3
2 2
1 ooooo1
er er
wt wt
sg sg

4
file2 Normal file
View File

@ -0,0 +1,4 @@
r
r
r
r