fix: merge conflict (b18d43c3) · Commits · IF3210-2024-KKK / IF3210-2024-Android-KKK · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF3210-2024-Android-KKK
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- 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.

IF3210-2024-KKK
IF3210-2024-Android-KKK
Commits
b18d43c3

Commit b18d43c3 authored 1 year ago by

Alifioditya

Downloads
- Plain Diff

fix: merge conflict

parents 669dccdb d61ccdfc

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

app/src/main/java/com/example/bondoman/AddTransaction.kt
app/src/main/java/com/example/bondoman/ScanActivity.kt 20 additions, 8 deletions

app/src/main/java/com/example/bondoman/ScanActivity.kt
app/src/main/java/com/example/bondoman/ui/settings/SettingsFragment.kt 9 additions, 0 deletions

...java/com/example/bondoman/ui/settings/SettingsFragment.kt
app/src/main/res/layout/fragment_settings.xml 21 additions, 0 deletions

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

with 80 additions and 8 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