u_fc9a210b6c55d909
/
imported-repository
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Update conflict file in main branch

pull/10787/head^2
eyramana 2 months ago
parent
22a6fec11c
commit
eaaf4200d2
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      conflict.txt

1
conflict.txt
Unescape View File

@ -1,2 +1,3 @@
hello world hello world
change made in main branch change made in main branch
This is the main branch version
Write Preview
Loading…
Cancel
Save