fix(rebase): whoops

ashleygwilliams · ashleygwilliams · commit fa2c17ae1ccf · 2019-02-27T10:39:50.000-08:00
diff --git a/tests/all/utils/fixture.rs b/tests/all/utils/fixture.rs
@@ -278,7 +278,6 @@ impl Fixture {
         self
     }
 
-<<<<<<< HEAD
     /// Get a `wasm-pack` command configured to run in this fixure's temp
     /// directory and using the test cache.
     pub fn wasm_pack(&self) -> Command {

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,6 @@ impl Fixture {`
`278`	`278`	`self`
`279`	`279`	`}`
`280`	`280`
`281`		`-<<<<<<< HEAD`
`282`	`281`	/// Get a `wasm-pack` command configured to run in this fixure's temp
`283`	`282`	`/// directory and using the test cache.`
`284`	`283`	`pub fn wasm_pack(&self) -> Command {`