search

twemyss / rse-classwork-2020

0 stars 0 forks source link

Merge conflicts #2

Open twemyss opened 4 years ago

twemyss commented 4 years ago

Introduction

This issue relates to Answers UCL-RITS/rse-classwork-2020#3

File details

File on main before attempting merge

Hola

File before resolving conflict:

<<<<<<< HEAD
Hola
=======
Hello World
>>>>>>> new-branch

File after resolving conflict:

Hello World