Alright, taking another crack at this. I seem to be missing something during the final merge of the master and together branches.
So, I’ve gone the entire way through the project again to that point. Here is what site.html looks like in my together branch:
And here’s the master version:
As far as I can tell, I’ve done everything exactly the same as last time. Before I submit this again, can you guys tell me where I’m going wrong?
The last time I got this far, after removing lands-end.jpg from the file structure and it’s corresponding line from the HTML I received the following feedback:
The questions you missed were:
--- a/site.html+++ b/site.html@@ -8,10 +8,13 @@- <img src="images/drawings/joseph-roulin.jpg">+<<<<<<< HEAD+ <img src="images/drawings/joseph-roulin.jpg">+=======+>>>>>>> pictures ```</strong>