Merge Conflict II - Step 3


#1

What am I suppose to type in the code editor? I don't recall learning this? Instructions say to delete using the code editor but I don't know how.


#2

That is the text editor in the middle panel. It takes a bit of looking at first, but you will see that it has added the bits from both versions of the file there and now you have to remove all of the lines that were added in the master branch.


#3

Thanks albion... i saw that immediately, but thought that was the text file and that the code editor was on the far left. It worked. Thanks again!