l-arnold / tkl-nomadic-odoo

Focused on Flow and Function
Other
4 stars 44 forks source link

Fix simple merge conflict :) #29

Closed JedMeister closed 9 years ago

l-arnold commented 9 years ago

Thanks Jeremy!. Studied ust a bit then hit the BIG GREEN merge button.

What I learned, generally, was not to "delete" Lines when their contents can just be deleted.

That said, it is possible that something else happened there. I do remember deleting those lines however and it was striking me wrong.