From 7bd9ce7582c6bbb647a3a5658ca88fc12807141f Mon Sep 17 00:00:00 2001 From: d3rped Date: Thu, 22 Mar 2018 03:27:48 +0100 Subject: [PATCH] Resolved merge/rebase conflicts. --- src/move.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/move.py b/src/move.py index 0580f68..9858839 100644 --- a/src/move.py +++ b/src/move.py @@ -92,7 +92,6 @@ class Move: self._wheel_r.speed_set(24) self._wheel_l.run() self._wheel_r.run() -<<<<<<< HEAD while (not (self._bumper.value() or self._sensor.isRed() or self._sensor.isBlue())): self._wheel_l.speed_set(48 - self._sensor.getbrightness()) self._wheel_r.speed_set(self._sensor.getbrightness())