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.

Sign up for GitHub

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

Jump to bottom

Changes changes after merging from master/dandi-archive into staging #17

Closed
sandyhider opened this issue Feb 17, 2025 · 1 comment
Closed

Changes changes after merging from master/dandi-archive into staging #17

sandyhider opened this issue Feb 17, 2025 · 1 comment

Comments

@sandyhider
Copy link

We need to look over conflicts visually and make sure they look correct.
Merge conflicts:

  • web/README.md
  • web/src/components/DandiFooter.vue
  • web/src/utils/constants.ts
  • web/src/views/CreateDandisetView/CreateDandisetView.vue
@NEStock
Copy link
Member

NEStock commented Feb 19, 2025

Closed by #20

@NEStock NEStock closed this as completed Feb 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

When branches are created from issues, their pull requests are automatically linked.

refs/heads/17-fix-changes-after-merging-from-master aplbrain/dandi-archive
2 participants
@sandyhider @NEStock