correct merge error

This commit is contained in:
Barbara Miller 2017-09-07 10:52:39 -07:00
parent bd83f079a7
commit 8b074ed8d8

View File

@ -120,10 +120,6 @@
actions:
- selector: .menu-item a
do: mouseover
<<<<<<< HEAD
do_until_hard_timeout: False
=======
>>>>>>> behavior-refactor
- url_regex: '^https?://(?:www\.)?news\.com\.au/.*$'
behavior_js_template: mouseovers.js.j2
default_parameters: