test: satisfy the binary size tests

Author: mikesmitty

builder/sizes_test.go

@@ -43,8 +43,13 @@ func TestBinarySize(t *testing.T) {
 	tests := []sizeTest{
 		// microcontrollers
 		{"hifive1b", "examples/echo", 4560, 280, 0, 2268},
+<<<<<<< HEAD
 		{"microbit", "examples/serial", 2924, 388, 8, 2272},
 		{"wioterminal", "examples/pininterrupt", 7383, 1489, 116, 6912},
+=======
+		{"microbit", "examples/serial", 2916, 388, 8, 2272},
+		{"wioterminal", "examples/pininterrupt", 7359, 1489, 116, 6912},
+>>>>>>> 7c7a5c78 (test: satisfy the binary size tests)
 
 		// TODO: also check wasm. Right now this is difficult, because
 		// wasm binaries are run through wasm-opt and therefore the