Tidy up merge conflict errors

jakeroseman · jakeroseman · commit e0a89426a218 · 2024-12-20T17:00:02.000Z
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/navigation/Destination.kt b/compose/snippets/src/main/java/com/example/compose/snippets/navigation/Destination.kt
@@ -50,6 +50,6 @@ enum class TopComponentsDestination(val route: String, val title: String) {
     TooltipExamples("tooltipExamples", "Tooltips"),
     NavigationDrawerExamples("navigationDrawerExamples", "Navigation drawer"),
     SegmentedButtonExamples("segmentedButtonExamples", "Segmented button"),
-    SwipeToDismissBoxExamples("swipeToDismissBoxExamples", "Swipe to dismiss box examples")
+    SwipeToDismissBoxExamples("swipeToDismissBoxExamples", "Swipe to dismiss box examples"),
     SearchBarExamples("searchBarExamples", "Search bar")
 }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ enum class TopComponentsDestination(val route: String, val title: String) {`
`50`	`50`	`TooltipExamples("tooltipExamples", "Tooltips"),`
`51`	`51`	`NavigationDrawerExamples("navigationDrawerExamples", "Navigation drawer"),`
`52`	`52`	`SegmentedButtonExamples("segmentedButtonExamples", "Segmented button"),`
`53`		`- SwipeToDismissBoxExamples("swipeToDismissBoxExamples", "Swipe to dismiss box examples")`
	`53`	`+ SwipeToDismissBoxExamples("swipeToDismissBoxExamples", "Swipe to dismiss box examples"),`
`54`	`54`	`SearchBarExamples("searchBarExamples", "Search bar")`
`55`	`55`	`}`