For #1397 - Updates changelog

CHANGELOG.md

@@ -25,6 +25,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #1068 - Adds the ability to quickly copy the URL by long clicking the URLBar
 - #1170: Allow user to add a new site exception to site permissions
 - #1430 - Adds the Fenix Snackbar
+- #1397 - Adds favicons to the history view
+
+>>>>>>> For #1397 - Updates changelog
 ### Changed
 - #1429 - Updated site permissions ui for MVP
 ### Removed

app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt

@@ -96,8 +96,8 @@ class HistoryListItemViewHolder(
         url.text = item.url
 
         val isEditing = mode is HistoryState.Mode.Editing
-        checkbox.visibility = if (isEditing) { View.VISIBLE } else { View.GONE }
-        favicon.visibility = if (isEditing) { View.INVISIBLE } else { View.VISIBLE }
+        checkbox.visibility = if (isEditing) View.VISIBLE else View.GONE
+        favicon.visibility = if (isEditing) View.INVISIBLE else View.VISIBLE
 
         if (mode is HistoryState.Mode.Editing) {
             checkbox.setOnCheckedChangeListener(null)