merge conflict (a97236f7) · Commits · PPL-VIZ-MASY / visualisasi · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

visualisasi
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

PPL-VIZ-MASY
visualisasi
Commits
a97236f7

Commit a97236f7 authored 6 years ago by

Dichi13

Downloads
- Plain Diff

merge conflict

parents 265a9067 c697f57c

Pipeline #10583 failed with stage

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Navbar.vue 22 additions, 25 deletions

src/components/Navbar.vue
src/components/pages/BiayaLangsungPage.vue 1 addition, 1 deletion

src/components/pages/BiayaLangsungPage.vue
src/components/pages/BiayaTidakLangsungPage.vue 1 addition, 1 deletion

src/components/pages/BiayaTidakLangsungPage.vue
src/components/pages/LandingPage.vue 2 additions, 2 deletions

src/components/pages/LandingPage.vue
src/components/pages/PembiayaanPage.vue 1 addition, 1 deletion

src/components/pages/PembiayaanPage.vue
src/components/pages/PendapatanPage.vue 1 addition, 1 deletion

src/components/pages/PendapatanPage.vue
src/components/pages/SemuaAnggaran.vue 31 additions, 0 deletions

src/components/pages/SemuaAnggaran.vue
src/router/index.js 10 additions, 5 deletions

src/router/index.js

with 69 additions and 36 deletions

0% 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