Git rid of 2119 language in definition section

deanwillis / p2psip-base-master

Master copy of P2PSIP Base draft

0 stars 0 forks source link

Git rid of 2119 language in definition section #215

Closed deanwillis closed 11 years ago

deanwillis commented 11 years ago

or revisit where the 2119 invocation should be.

petithug commented 11 years ago

You can close this one, and use #216 instead.

deanwillis commented 11 years ago

Won't auto-merge. I gotta learn more about merging.

petithug commented 11 years ago

It's because there is a conflict with a previously merge pull request. As soon level2 is merged in Cullen's repo, I'll rebase this branch (and all the other), resolve the conflicts, and push again. Then this pull will be mergeable again.