fix: develop conflict (adfbbced) · Commits · Antonio Natthan Krishna / IF3210 2024 Android SKS · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF3210 2024 Android SKS
- Activity
- Members
- Labels
- Environments
- Terraform modules
- 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.

Antonio Natthan Krishna
IF3210 2024 Android SKS
Commits
adfbbced

Commit adfbbced authored 1 year ago by

Natthan Krish

Downloads
- Patches
- Plain Diff

fix: develop conflict

parent f90db787

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/bondoman/activities/EditTransaction.kt 0 additions, 30 deletions

...n/java/com/example/bondoman/activities/EditTransaction.kt
app/src/main/java/com/example/bondoman/activities/LoginActivity.kt 1 addition, 0 deletions

...ain/java/com/example/bondoman/activities/LoginActivity.kt
app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt 2 additions, 2 deletions

.../java/com/example/bondoman/fragments/TransaksiFragment.kt
app/src/main/res/anim/slide_down.xml 8 additions, 5 deletions

app/src/main/res/anim/slide_down.xml
app/src/main/res/layout/activity_login.xml 0 additions, 4 deletions

app/src/main/res/layout/activity_login.xml

with 11 additions and 41 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