search

Zsailer / python-for-scientists

The easy way to set up Python for a scientist.
http://python-for-scientists.readthedocs.io/
8 stars 7 forks source link

Snsboxplot #31

Closed lcwheeler closed 6 years ago

Zsailer commented 6 years ago

Looks like there are some conflicts... You'll have to rebase your branch against master before we can merge.

lcwheeler commented 6 years ago

Okay, will do! Any idea why it's conflicting with those zip directories?

Zsailer commented 6 years ago

@biophyser Was this ready to merge?

biophyser commented 6 years ago

It said the conflicts were resolved. I was here and I sent it. image

lcwheeler commented 6 years ago

:+1:

Zsailer commented 6 years ago

Sounds good. Didn't see the fix--- thought you had magical powers to merge with conflicts! ;)