suctuk / Recitation-013-Team-1

0 stars 0 forks source link

Recitation-013-Team-1

"Project Team Members:

I (cutoa) am editing this file for demonstration purposes.

Recitation-013-Team-1

LeeLee James @TwirlingTechGoddess.

Batool Hani @Batoolfh.

(My change1 retry since it deleted for some reason) Sena Uctuk @suctuk.

(playing with places to implement merge conflicts) Jason Swartz @Cutoa.

Owen Newton @Owen12621.

CREATING A MERGE CONFLICT 2

test changes in review

creating yet another merge conflict. -Jason Hello! edit file Practice edit file again

Recitation-013-Team-1

"Project Team Members:

LeeLee James @TwirlingTechGoddess.

Batool Hani @Batoolfh.

(My change1)(My change2)(My change3)(My change4) Sena Uctuk @suctuk.

(playing with places to implement merge conflicts) Jason Swartz @Cutoa.

Owen Newton @Owen12621.

CREATING A MERGE CONFLICT