fixing merge issue - Githubissues

PieFon / heybartender

pick your poison

1 stars 0 forks source link

fixing merge issue #78

Closed eubank87 closed 3 years ago

eubank87 commented 3 years ago

Accepted merge conflicts from previous merge. All's good, whew!

Calmanning commented 3 years ago

Thanks Ashley!