Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

db86e85c

Commit db86e85c authored 11 months ago by Anders Høvik

Downloads
- Plain Diff

fix: fixed merge conflict

parents c260835f c80d30d2

No related branches found

No related tags found

1 merge request!44Fix/pipeline

Pipeline #279500 failed 11 months ago

Stage: install_dependencies

Stage: lint

Stage: build_project

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Buttons/Button1.vue 1 addition, 1 deletion

src/components/Buttons/Button1.vue
src/components/Buttons/ShopButton.vue 1 addition, 1 deletion

src/components/Buttons/ShopButton.vue
src/views/Authentication/ChangePasswordView.vue 1 addition, 1 deletion

src/views/Authentication/ChangePasswordView.vue
src/views/LeaderboardView.vue 1 addition, 3 deletions

src/views/LeaderboardView.vue
src/views/Settings/SettingsNotificationView.vue 5 additions, 5 deletions

src/views/Settings/SettingsNotificationView.vue
src/views/UnauthorizedView.vue 1 addition, 0 deletions

src/views/UnauthorizedView.vue

with 10 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment