Fix merge conflict (9ad9d552) · Commits · CliffTheDragonJohn / templatePPL2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

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

CliffTheDragonJohn
templatePPL2
Commits
9ad9d552

There was a problem fetching the latest pipeline status.

Commit 9ad9d552 authored 9 years ago by

Cliff Jonathan

Downloads
- Plain Diff

Fix merge conflict

parents b30b5e4f 5a171c0b

Branches

Pipeline #2916 skipped

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

ppl2/.env.example 3 additions, 3 deletions

ppl2/.env.example
ppl2/app/Http/Controllers/InstitusiController.php 2 additions, 0 deletions

ppl2/app/Http/Controllers/InstitusiController.php
ppl2/app/Http/Controllers/PendFormalController.php 1 addition, 0 deletions

ppl2/app/Http/Controllers/PendFormalController.php
ppl2/app/Http/Controllers/PendinFormalController.php 2 additions, 0 deletions

ppl2/app/Http/Controllers/PendinFormalController.php
ppl2/app/Http/Controllers/PenjadwalanController.php 2 additions, 0 deletions

ppl2/app/Http/Controllers/PenjadwalanController.php
ppl2/app/Http/Controllers/pendaftaranController.php 2 additions, 0 deletions

ppl2/app/Http/Controllers/pendaftaranController.php

with 12 additions and 3 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