Fix merge conflict on datetimepicker (c3949ce2) · 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
c3949ce2

Commit c3949ce2 authored 6 years ago by

13516139 Ahmad Fahmi Pratama

Downloads
- Plain Diff

Fix merge conflict on datetimepicker

parents c2fa5b3d d462ab34

Pipeline #7754 failed with stage

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 27 additions, 19 deletions

package-lock.json
package.json 3 additions, 1 deletion

package.json
resources/assets/js/app.js 2 additions, 1 deletion

resources/assets/js/app.js
resources/assets/js/bulk_upload.js 12 additions, 19 deletions

resources/assets/js/bulk_upload.js
resources/assets/sass/app.scss 3 additions, 0 deletions

resources/assets/sass/app.scss
resources/views/layouts/app.blade.php 4 additions, 1 deletion

resources/views/layouts/app.blade.php
resources/views/mahasiswa/form_pengajuan_topik.blade.php 36 additions, 36 deletions

resources/views/mahasiswa/form_pengajuan_topik.blade.php
resources/views/manajer/detail_mahasiswa_control.blade.php 60 additions, 10 deletions

resources/views/manajer/detail_mahasiswa_control.blade.php

with 147 additions and 87 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