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

Collection Show Page #578

Merged
merged 1 commit into from
Jul 16, 2014
Merged

Collection Show Page #578

merged 1 commit into from
Jul 16, 2014

Conversation

mtribone
Copy link
Contributor

Adjustments to layout for 2 columns, switched graphic to icon font, added styles.

@awead
Copy link
Contributor

awead commented Jul 15, 2014

@mtribone squash yer commits 👢

@mtribone
Copy link
Contributor Author

Squashed but can't push "because branch tip is behind its remote counterpart"

@awead
Copy link
Contributor

awead commented Jul 15, 2014

sounds like you may need to pull in upstream commits so psu/sufia is in sync with ph/sufia

@mtribone
Copy link
Contributor Author

fetched upstream and merged with my branch. same error message

awead added a commit that referenced this pull request Jul 16, 2014
@awead awead merged commit 50bdce7 into samvera-deprecated:master Jul 16, 2014
@awead awead deleted the collection-show2 branch July 16, 2014 15:16
jcoyne added a commit that referenced this pull request Nov 17, 2016
Delete derivatives when FileSet is destroyed.
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.

None yet

2 participants