diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 599: remove broken like (probably left there by a unfinished merge conflict resolution)

Message ID 20130514190026.21322.62069.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Antonio Terceiro May 14, 2013, 7 p.m. UTC
------------------------------------------------------------
revno: 599
committer: Antonio Terceiro <antonio.terceiro@linaro.org>
branch nick: trunk
timestamp: Tue 2013-05-14 15:58:37 -0300
message:
  remove broken like (probably left there by a unfinished merge conflict resolution)
modified:
  lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2013-05-13 11:20:17 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2013-05-14 18:58:37 +0000
@@ -131,6 +131,6 @@ 
 # obtained from boot.txt or uEnv.txt and others. Can be overridden in device
 # specific config file.
 testboot_offset = 2
-=======
+
 # How many times the dispatcher should try to reboot master and test images before failing
 boot_retries = 3