conflict resolve with ktlint

BCSDLab · Jan 10, 2023 · 5d1c961 · 5d1c961
1 parent c291966
commit 5d1c961
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/login/LoginActivity.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/login/LoginActivity.kt
@@ -54,6 +54,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             }
             textViewFindId.setOnClickListener {
                 goToFindIdActivity()
+            }
             buttonLogin.setOnClickListener {
                 viewModel.login()
             }
@@ -76,6 +77,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
     }
     fun goToFindIdActivity() {
         Intent(this, FindIdActivity::class.java).also { startActivity(it) }
+    }
     fun goToMainActivity() {
         Intent(this, MainPageActivity::class.java).also { startActivity(it) }
     }

diff --git a/data/src/main/java/com/jjbaksa/data/api/AuthApi.kt b/data/src/main/java/com/jjbaksa/data/api/AuthApi.kt
@@ -23,5 +23,3 @@ interface AuthApi {
         @Query("code") codeNumber: String
     ): Call<FindIdResp>
 }
-
-
diff --git a/domain/src/main/java/com/jjbaksa/domain/resp/findid/FindIdResp.kt b/domain/src/main/java/com/jjbaksa/domain/resp/findid/FindIdResp.kt
@@ -1,6 +1,6 @@
 package com.jjbaksa.domain.resp.findid
 
-data class FindIdResp (
+data class FindIdResp(
     val account: String,
     val email: String,
     val id: Int,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,5 +23,3 @@ interface AuthApi {
		@Query("code") codeNumber: String
		): Call<FindIdResp>
		}