장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
5b30a348 1 parent ec9e40ed

modified merge error

Inline Side-by-side
Showing 1 changed file with 0 additions and 12 deletions
...@@ -50,19 +50,7 @@ class SearchActivity : AppCompatActivity() { ...@@ -50,19 +50,7 @@ class SearchActivity : AppCompatActivity() {
50 Toast.makeText(this@SearchActivity, "실패부분 : $query", Toast.LENGTH_SHORT).show() 50 Toast.makeText(this@SearchActivity, "실패부분 : $query", Toast.LENGTH_SHORT).show()
51 } 51 }
52 override fun onDataChange(dataSnapshot: DataSnapshot) { 52 override fun onDataChange(dataSnapshot: DataSnapshot) {
53 -<<<<<<< HEAD
54 - for(memoSnapshot in dataSnapshot.children){
55 -=======
56 -
57 -// 타겟 1개 if (dataSnapshot.exists()){
58 -// val memo = dataSnapshot.getValue(MemoItem::class.java)
59 -// if (memo != null){
60 - // Toast.makeText(this@SearchActivity, memo!!.Policy, Toast.LENGTH_SHORT).show()
61 - // }
62 -//
63 -// }
64 for (memoSnapshot in dataSnapshot.children){ 53 for (memoSnapshot in dataSnapshot.children){
65 ->>>>>>> makeUserDB
66 val memo = memoSnapshot.getValue(MemoItem::class.java) 54 val memo = memoSnapshot.getValue(MemoItem::class.java)
67 55
68 searchList.add( 56 searchList.add(
......