Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-09-22 13:44:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct merge error

Browse source
This commit is contained in:
Barbara Miller 2017-09-07 10:52:39 -07:00
parent bd83f079a7
commit 8b074ed8d8
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brozzler/behaviors.yaml
View file

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