Commit e3a333d9 authored by Benjamin Drieu's avatar Benjamin Drieu

Fix conflict

parent b558ed42
......@@ -7,10 +7,10 @@ Key = space
Repeat = 1
[CenterDown]
#File = /tmp/foo
#Message = Down\n
#Create = 1
Key = space
File = /tmp/fifo
Message = pause\n
Create = 1
#Key = space
#[CenterUp]
#File = /tmp/foo
......@@ -18,4 +18,6 @@ Key = space
#Create = 1
[RightDown]
Key = Page_Down
Key = Shift+Right
File = /tmp/fifo
Message = seek +10\n
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment