search

ubsuny / 23-Homework1G1

Homework 1 Repository Group 1
0 stars 6 forks source link

Git conflict markers #20

Closed laserlab closed 12 months ago

laserlab commented 12 months ago

Make sure you don’t have merge conflicts markers left in your files

https://github.com/ubsuny/23-Homework1G1/blob/f3e3e06adc712d4bdf0a73d0532620d9fae4ab86/quantum_multiplication_v2.py#L28

See: https://stackoverflow.com/questions/7901864/git-conflict-markers#7901901

WildJimmy commented 12 months ago

Thank you for pointing this out. I'll take a look and resolve this later

WildJimmy commented 12 months ago

Conflict markers have been removed and code has been reformatted properly