Resolve conflict (009d0f60) · 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
009d0f60

There was a problem fetching the latest pipeline status.

Commit 009d0f60 authored 9 years ago by

Tama

Downloads
- Plain Diff

Resolve conflict

parents ae968d0d fe12512c

No related merge requests found

Pipeline #1388 skipped

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

P3/controller/connectdb.php 28 additions, 0 deletions

P3/controller/connectdb.php
P3/css/style.css 6 additions, 1 deletion

P3/css/style.css
P3/form_penilaian_skp.php 151 additions, 0 deletions

P3/form_penilaian_skp.php
P3/form_perilaku_kerja.php 56 additions, 9 deletions

P3/form_perilaku_kerja.php
P3/perilaku_kerja.php 71 additions, 0 deletions

P3/perilaku_kerja.php
P3/perilaku_kerja_controller.php 89 additions, 0 deletions

P3/perilaku_kerja_controller.php
penilaian_performansi.sql 75 additions, 27 deletions

penilaian_performansi.sql

with 476 additions and 37 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