Tweak

border/Cargo.toml

@@ -109,19 +109,17 @@ path = "examples/mujoco/sac_mujoco_tch.rs"
 required-features = ["tch"]
 test = false
 
-<<<<<<< HEAD
 [[example]]
 name = "convert_sac_policy_to_edge"
 path = "examples/gym/convert_sac_policy_to_edge.rs"
 required-features = ["border-tch-agent", "tch"]
 test = false
-=======
+
 # [[example]]
 # name = "sac_ant_async"
 # path = "examples/mujoco/sac_ant_async.rs"
 # required-features = ["tch", "border-async-trainer"]
 # test = false
->>>>>>> origin/dev_0_0_7
 
 [[example]]
 name = "pendulum_edge"
@@ -152,10 +150,7 @@ border-derive = { version = "0.0.7", path = "../border-derive" }
 border-core = { version = "0.0.7", path = "../border-core" }
 border-tensorboard = { version = "0.0.7", path = "../border-tensorboard" }
 border-tch-agent = { version = "0.0.7", path = "../border-tch-agent" }
-<<<<<<< HEAD
 border-policy-no-backend = { version = "0.0.7", path = "../border-policy-no-backend" }
-=======
->>>>>>> origin/dev_0_0_7
 border-py-gym-env = { version = "0.0.7", path = "../border-py-gym-env" }
 border-atari-env = { version = "0.0.7", path = "../border-atari-env" }
 border-candle-agent = { version = "0.0.7", path = "../border-candle-agent" }