Skip to content

Conversation

@csantero
Copy link
Collaborator

As per discussion in #7.

@SphtKr
Copy link
Collaborator

SphtKr commented Jan 20, 2015

Aw crap, I didn't see this and had already done the fix on my end. I updated some docs in my commit but didn't get the packages manifest as you did in yours. Could you rebase this? Thanks, sorry.

SphtKr added a commit that referenced this pull request Jan 20, 2015
@csantero 's pull request removes the packages from the manifest, which I missed!
@SphtKr SphtKr merged commit 97091ed into JSONAPIdotNET:master Jan 20, 2015
@SphtKr
Copy link
Collaborator

SphtKr commented Jan 20, 2015

Never mind rebasing, sorry...I thought I would have created a conflict, but it looks like it merges fine as is!

@csantero csantero deleted the remove-odata branch January 21, 2015 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants