Okay this is a start. Not sure if I managed to copy everything in correctly. My desktop git version wasn't the local one that I was working off of, so I need to sort that out! 💃
The conflicts seem to be the stuff I changed a few days ago, (I put in a font awesome link and capitalised New Book) but that wasn't in the latest files I was working in so I would have added it again then.
Okay this is a start. Not sure if I managed to copy everything in correctly. My desktop git version wasn't the local one that I was working off of, so I need to sort that out! 💃