Resolving conflicts after renaming. (de272eeb) · Commits · AceOneworks / IES Bandung · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IES Bandung
- 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.

AceOneworks
IES Bandung
Commits
de272eeb

Commit de272eeb authored 9 years ago by

Erick Chandra

Downloads
- Plain Diff

Resolving conflicts after renaming.

parents 567727bd 074befd8

Pipeline #1846 skipped

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

IES-Bandung/app/Http/Controllers/ObjectSellController.php 6 additions, 1 deletion

IES-Bandung/app/Http/Controllers/ObjectSellController.php
IES-Bandung/app/Http/Controllers/ProfileController.php 2 additions, 2 deletions

IES-Bandung/app/Http/Controllers/ProfileController.php
IES-Bandung/app/Http/Controllers/PublicUserController.php 1 addition, 1 deletion

IES-Bandung/app/Http/Controllers/PublicUserController.php
IES-Bandung/app/Http/Controllers/VendorUserController.php 5 additions, 4 deletions

IES-Bandung/app/Http/Controllers/VendorUserController.php
IES-Bandung/app/Http/routes.php 1 addition, 1 deletion

IES-Bandung/app/Http/routes.php
IES-Bandung/app/Model/VendorUser.php 1 addition, 1 deletion

IES-Bandung/app/Model/VendorUser.php
IES-Bandung/public/img/pasar.png 0 additions, 0 deletions

IES-Bandung/public/img/pasar.png
IES-Bandung/resources/views/auth/login.blade.php 3 additions, 1 deletion

IES-Bandung/resources/views/auth/login.blade.php
IES-Bandung/resources/views/vendorUser.blade.php 4 additions, 7 deletions

IES-Bandung/resources/views/vendorUser.blade.php

with 23 additions and 18 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