Mscweb #448

Closed
wants to merge 4 commits into
from

Conversation

Projects
None yet
2 participants
Member

pkediyal commented Jan 8, 2013

No description provided.

Contributor

daf commented Jan 8, 2013

Couple of comments:

  • You'll need to merge master in your branch to resolve whatever Github is saying can't be auto-merged. I'm assuming it's the ion-defs change, did you mean to change it?
  • Since the html file is referencing d3 and jquery from CDNs, you likely don't need to include them in our codebase.
Member

pkediyal commented Jan 8, 2013

ion-def changes must be synchronously pushed for conversation log to work. So far, Michael handles that mess and I am a bit unsure of my role in the protocol regarding how that is managed.

I did not change the html file nor its libraries. Nevertheless, I did incorrectly think that it was referencing local.

I will close this and make changes.

pkediyal closed this Jan 8, 2013

Contributor

daf commented Jan 8, 2013

You don't have to close - push more commits to the same branch and they'll automatically show up here. Keeps the flow going.

Member

pkediyal commented Jan 8, 2013

so should I first create a pull request for ion-defs? then when that gets merged I can update the submodule in pyon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment