Fix conflict on tesis-history (70003a05) · Commits · 13516139 Ahmad Fahmi Pratama / S2_TESIS · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

S2_TESIS
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- 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.

13516139 Ahmad Fahmi Pratama
S2_TESIS
Commits
70003a05

Commit 70003a05 authored 6 years ago by

13516139 Ahmad Fahmi Pratama

Downloads
- Plain Diff

Fix conflict on tesis-history

parents 5ee7c7be 0fd2ec40

No related merge requests found

Pipeline #8020 failed with stage

Changes 4
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 2582 additions, 2199 deletions

package-lock.json
resources/assets/sass/component/mahasiswa-control.scss 11 additions, 0 deletions

resources/assets/sass/component/mahasiswa-control.scss
resources/views/dosen/index.blade.php 1 addition, 1 deletion

resources/views/dosen/index.blade.php
resources/views/manajer/kelas_tesis.blade.php 3 additions, 3 deletions

resources/views/manajer/kelas_tesis.blade.php

with 2597 additions and 2203 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