diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-09 09:32:45 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-09 09:32:45 +0100 |
commit | 2bf02f2429738d820fd98de1078b5265696dbbb5 (patch) | |
tree | 5dc37df17c0e03f77b544eb87c0b5de9d6647ed7 /openbsd-compat/bsd-cray.h | |
parent | 0d6a7068412ff99144c5755d741dee7dd9cd97b2 (diff) |
Fix consolekit mismerges in monitor.c and monitor_wrap.c.
Diffstat (limited to 'openbsd-compat/bsd-cray.h')
0 files changed, 0 insertions, 0 deletions