andyburke/grmble

Few changes #45

Merged

tristau merged 9 commits from master into master

2012-05-15 15:06:46 -07:00

tristau commented

2012-05-15 12:40:25 -07:00

(Migrated from github.com)

Hey you might want to look over these changes, I'm not sure if the merge happened correctly. It looks like everything is up to date, but let me know.

Hey you might want to look over these changes, I'm not sure if the merge happened correctly. It looks like everything is up to date, but let me know.

andyburke commented

2012-05-15 12:47:17 -07:00

(Migrated from github.com)

Hmm, so there are conflicts with this pull request. I think you should try to merge master into your fork and fix them so that this could be auto-merged.

Hmm, so there are conflicts with this pull request. I think you should try to merge master into your fork and fix them so that this could be auto-merged.

andyburke commented

2012-05-15 12:48:17 -07:00

(Migrated from github.com)

I just read your comment more fully. Yeah, it doesn't look like the merge went quite perfectly because it can't be auto-merged. :( I feel like Messages.js might be the issue. I would try diffing that against the one in master and see ... I think it has to do with the messages query.

I just read your comment more fully. Yeah, it doesn't look like the merge went quite perfectly because it can't be auto-merged. :( I feel like Messages.js might be the issue. I would try diffing that against the one in master and see ... I think it has to do with the messages query.

Sign in to join this conversation.

No reviewers

No labels

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

andyburke/grmble!45

No description provided.