modified merge error

@@ -50,19 +50,7 @@ class SearchActivity : AppCompatActivity() {
                         Toast.makeText(this@SearchActivity, "실패부분 : $query", Toast.LENGTH_SHORT).show()
                     }
                     override fun onDataChange(dataSnapshot: DataSnapshot) {
-<<<<<<< HEAD
-                        for(memoSnapshot in dataSnapshot.children){
-=======
-
-// 타겟 1개                       if (dataSnapshot.exists()){
-//                            val memo =  dataSnapshot.getValue(MemoItem::class.java)
-//                            if (memo != null){
- //                               Toast.makeText(this@SearchActivity, memo!!.Policy, Toast.LENGTH_SHORT).show()
-  //                          }
-//
-//                        }
                         for (memoSnapshot in dataSnapshot.children){
->>>>>>> makeUserDB
                             val memo = memoSnapshot.getValue(MemoItem::class.java)
 
                             searchList.add(