fix : Conflict 후 에러 수정

koreatlwls · koreatlwls · commit 0387bd7deafe · 2022-11-27T22:42:11.000+09:00
diff --git a/presentation/src/main/java/com/stop/ui/map/MapFragment.kt b/presentation/src/main/java/com/stop/ui/map/MapFragment.kt
@@ -164,7 +164,7 @@ class MapFragment : Fragment(), MapHandler {
                     tMap.makeMarker(
                         PLACE_MARKER,
                         PLACE_MARKER_IMG,
-                        currentTMapPoint
+                        currentTmapPoint
                     )
                 }
         }
diff --git a/presentation/src/main/java/com/stop/ui/mission/TMap.kt b/presentation/src/main/java/com/stop/ui/mission/TMap.kt
diff --git a/presentation/src/main/res/navigation/nav_graph.xml b/presentation/src/main/res/navigation/nav_graph.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/alarmSetting">
+    app:startDestination="@id/mapFragment">
 
     <fragment
         android:id="@+id/mapFragment"

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ class MapFragment : Fragment(), MapHandler {`
`164`	`164`	`tMap.makeMarker(`
`165`	`165`	`PLACE_MARKER,`
`166`	`166`	`PLACE_MARKER_IMG,`
`167`		`- currentTMapPoint`
	`167`	`+ currentTmapPoint`
`168`	`168`	`)`
`169`	`169`	`}`
`170`	`170`	`}`