realfastvla / realfast

Real-time interferometric data analysis for the VLA
http://realfast.io
BSD 3-Clause "New" or "Revised" License
10 stars 4 forks source link

mergeing from Casey's #2

Closed xiggystardust closed 9 years ago

xiggystardust commented 9 years ago

Hey Casey, I obviously am being a little derpy with git. I'm not totally sure how to make our projects synchronous again but I am near to just reforking yours. Anyways this pull should make our synchronous. - S

caseyjlaw commented 9 years ago

I am a bit confused, too. I think you may have just requested that I pull and merge your older version. I think that would undo the changes I made yesterday. I'll decline that and try to generate a pull request for you.