Resolve conflict (48f61c39) · Commits · ASH / 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.

ASH
templatePPL2
Commits
48f61c39

Commit 48f61c39 authored 9 years ago by

Tama

Downloads
- Plain Diff

Resolve conflict

parents 5e1362e7 4d2ec6e1

Pipeline #1651 skipped

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

P3/aside.php 17 additions, 53 deletions

P3/aside.php
P3/controller/perilaku_kerja_controller.php 120 additions, 32 deletions

P3/controller/perilaku_kerja_controller.php
P3/edit_perilaku_kerja.php 186 additions, 0 deletions

P3/edit_perilaku_kerja.php
P3/form_perilaku_kerja.php 8 additions, 5 deletions

P3/form_perilaku_kerja.php
P3/formskp.php 1 addition, 1 deletion

P3/formskp.php
P3/perilaku_kerja.php 15 additions, 3 deletions

P3/perilaku_kerja.php
P3/perilaku_kerja_pribadi.php 146 additions, 0 deletions

P3/perilaku_kerja_pribadi.php

with 493 additions and 94 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