Thomas-Basham / merge-conflicts-demo

class about git merges

here is some text from Thomas

more code from thomas

• Dwight added stuff here more stuff from Thomas

we need this stuff too from Thomas

• we need this stuff too from Thomas

September 20: merge-conflicts-demo

• this is a great lab

• code from thomas

more code from Thomas

code stuff from thomas

Some more code from Thomas

Thomas code here