summaryrefslogtreecommitdiff
path: root/monitor.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-09 09:32:45 +0100
committerColin Watson <cjwatson@debian.org>2013-05-09 09:32:45 +0100
commit2bf02f2429738d820fd98de1078b5265696dbbb5 (patch)
tree5dc37df17c0e03f77b544eb87c0b5de9d6647ed7 /monitor.h
parent0d6a7068412ff99144c5755d741dee7dd9cd97b2 (diff)
Fix consolekit mismerges in monitor.c and monitor_wrap.c.
Diffstat (limited to 'monitor.h')
0 files changed, 0 insertions, 0 deletions