Remove unused if block.

google/resource_compute_instance_group_migrate_test.go

@@ -65,10 +65,6 @@ func TestComputeInstanceGroupMigrateState(t *testing.T) {
 		}
 
 		for k, v := range tc.ExpectedAttributes {
-			if k == "id" {
-
-			}
-
 			if is.Attributes[k] != v {
 				t.Fatalf(
 					"bad: %s\n\n expected: %#v -> %#v\n got: %#v -> %#v\n in: %#v",
@@ -103,11 +99,19 @@ func TestComputeInstanceGroupMigrateState_empty(t *testing.T) {
 		if is != nil {
 			t.Fatalf("bad %s, expected nil instancestate, got: %#v", tn, is)
 		}
+<<<<<<< Updated upstream
+
+		// should handle non-nil but empty
+		is = &terraform.InstanceState{}
+		is, err = resourceComputeInstanceGroupMigrateState(tc.StateVersion, is, meta)
+
+=======
 
 		// should handle non-nil but empty
 		is = &terraform.InstanceState{}
 		is, err = resourceComputeInstanceGroupMigrateState(tc.StateVersion, is, meta)
 
+>>>>>>> Stashed changes
 		if err != nil {
 			t.Fatalf("bad %s, err: %#v", tn, err)
 		}