resolve conflict
Showing
- app/build.gradle 0 additions, 27 deletionsapp/build.gradle
- app/src/main/AndroidManifest.xml 2 additions, 20 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/ic_launcher-playstore.png 0 additions, 0 deletionsapp/src/main/ic_launcher-playstore.png
- app/src/main/java/com/example/perludilindungi/ApiInterface.kt 0 additions, 44 deletions...src/main/java/com/example/perludilindungi/ApiInterface.kt
- app/src/main/java/com/example/perludilindungi/MainActivity.kt 0 additions, 5 deletions...src/main/java/com/example/perludilindungi/MainActivity.kt
- app/src/main/java/com/example/perludilindungi/Model/CheckInResponse.kt 0 additions, 11 deletions...java/com/example/perludilindungi/Model/CheckInResponse.kt
- app/src/main/java/com/example/perludilindungi/Model/Daerah.kt 0 additions, 7 deletions...src/main/java/com/example/perludilindungi/Model/Daerah.kt
- app/src/main/java/com/example/perludilindungi/Model/DaerahResponse.kt 0 additions, 3 deletions.../java/com/example/perludilindungi/Model/DaerahResponse.kt
- app/src/main/java/com/example/perludilindungi/Model/EnclosureModel.kt 0 additions, 8 deletions.../java/com/example/perludilindungi/Model/EnclosureModel.kt
- app/src/main/java/com/example/perludilindungi/Model/Faskes.kt 0 additions, 10 deletions...src/main/java/com/example/perludilindungi/Model/Faskes.kt
- app/src/main/java/com/example/perludilindungi/Model/FaskesResponse.kt 0 additions, 3 deletions.../java/com/example/perludilindungi/Model/FaskesResponse.kt
- app/src/main/java/com/example/perludilindungi/Model/NewsModel.kt 0 additions, 14 deletions.../main/java/com/example/perludilindungi/Model/NewsModel.kt
- app/src/main/java/com/example/perludilindungi/Model/PostResponse.kt 0 additions, 5 deletions...in/java/com/example/perludilindungi/Model/PostResponse.kt
- app/src/main/java/com/example/perludilindungi/Model/ResultNews.kt 0 additions, 23 deletions...main/java/com/example/perludilindungi/Model/ResultNews.kt
- app/src/main/java/com/example/perludilindungi/News_Webview.kt 0 additions, 30 deletions...src/main/java/com/example/perludilindungi/News_Webview.kt
- app/src/main/java/com/example/perludilindungi/RecyclerAdapter.kt 0 additions, 55 deletions.../main/java/com/example/perludilindungi/RecyclerAdapter.kt
- app/src/main/java/com/example/perludilindungi/SplashScreen.kt 0 additions, 27 deletions...src/main/java/com/example/perludilindungi/SplashScreen.kt
- app/src/main/java/com/example/perludilindungi/bookmark.kt 0 additions, 43 deletionsapp/src/main/java/com/example/perludilindungi/bookmark.kt
- app/src/main/java/com/example/perludilindungi/checkin.kt 0 additions, 204 deletionsapp/src/main/java/com/example/perludilindungi/checkin.kt
- app/src/main/java/com/example/perludilindungi/news.kt 0 additions, 52 deletionsapp/src/main/java/com/example/perludilindungi/news.kt
58.8 KiB
-
mentioned in commit 08d6f256
-
mentioned in merge request !17 (merged)
-
mentioned in commit e9a817f8