Merge conflicts, part II

2019-09-24 11:05:43 -05:00 · 2019-09-24 11:05:43 -05:00 · 9a59395715
parent 1acb46486c
commit 9a59395715
1 changed files with 0 additions and 8 deletions
--- a/frontend/resources/tests/sequence_meta_test.ts
+++ b/frontend/resources/tests/sequence_meta_test.ts
@ -70,15 +70,7 @@ describe("determineDropdown", () => {
      kind: "parameter_application",
      args: {
        label: "x",
-<<<<<<< HEAD
        data_value: { kind: "every_point", args: { every_point_type: "Plant" } }
-=======
-        data_value: {
-          kind: "every_point",
-          args: { every_point_type: "Plant" }
-          // tslint:disable-next-line:no-any
-        } as any
->>>>>>> a3d73b35c6816f37dd0ad295d5fb9462ee24ed02
      }
    }, buildResourceIndex([]).index);
    expect(r.label).toBe("All plants");