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

Resolved merge conflict between master and conflict-feature

pull/10890/head
Khanishk 1 month ago
parent
b28a2f0a61 931235b748
commit
ca97b34907
1 changed files with 5 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README

4
README
Unescape View File

@ -1,2 +1,6 @@
Hello World!
<<<<<<< HEAD
### Branch Feature - Added on conflict branch
=======
### Master Branch Update - Conflicting Line
>>>>>>> master

Write Preview
Loading…
Cancel
Save