Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing browsing plate error, close #7862 #76

Merged
merged 5 commits into from Feb 14, 2012

Conversation

@olatarkowska
Copy link
Member

commented Jan 26, 2012

Hi, could you please merge bug fixed in sprint 7.

@joshmoore

This comment has been minimized.

Copy link
Member

commented Jan 31, 2012

@chris-allan , I tested 366e79a and didn't see the "ERROR" message appear during delete.

@chris-allan

This comment has been minimized.

Copy link
Member

commented Feb 6, 2012

@aleksandra-tarkowska: With the django_logging branch merged in to develop this will have to have origin/develop merged in and conflicts resolved before further commits are made:

git checkout sprint7-web-backlog
# Assuming that origin is GitHub
git fetch origin
git merge origin/develop
# Fix conflicts...
git commit
git push <your_github_remote_name> sprint7-web-backlog
@olatarkowska

This comment has been minimized.

Copy link
Member Author

commented Feb 13, 2012

@chris-allan

This comment has been minimized.

Copy link
Member

commented Feb 14, 2012

All looking good. Merging.

chris-allan added a commit that referenced this pull request Feb 14, 2012

@chris-allan chris-allan merged commit e493627 into ome:develop Feb 14, 2012

joshmoore pushed a commit to joshmoore/openmicroscopy that referenced this pull request Apr 21, 2015
Merge pull request ome#76 from joshmoore/trac-11779-graphs
fix #11779: graph operations use "compiler" rather than "rollback" strategy
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.