summaryrefslogtreecommitdiffstats
path: root/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/cases/snapshots/ui__no_resolve_mode-2.snap')
-rw-r--r--src/tests/cases/snapshots/ui__no_resolve_mode-2.snap5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap
index 857fa24..5f83849 100644
--- a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap
+++ b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap
@@ -30,8 +30,13 @@ expression: "&terminal_draw_events_mirror[2]"
+<<<<<<< HEAD
3 3 3 3 32 46
1 1 1 1 7 6
+=======
+ 3 3 3 3 33 4
+ 1 1 1 1 47 48
+>>>>>>> Update UI snapshots for new bandwidth calculation