diff options
| author | Conor Curran <conor.curran@canonical.com> | 2012-02-08 17:23:19 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2012-02-08 17:23:19 +0000 |
| commit | 4145c29279197d5985d348fbe2ef219a4c015a11 (patch) | |
| tree | a1d8b6bfaca4cc21ff3e24c209e1f5772732c252 /src/org.freedesktop.ConsoleKit.Seat.xml | |
| parent | d4162d24e4bdee56df9bf6815207cf0ecf15fed3 (diff) | |
| download | ayatana-indicator-session-4145c29279197d5985d348fbe2ef219a4c015a11.tar.gz ayatana-indicator-session-4145c29279197d5985d348fbe2ef219a4c015a11.tar.bz2 ayatana-indicator-session-4145c29279197d5985d348fbe2ef219a4c015a11.zip | |
correct conflict
Diffstat (limited to 'src/org.freedesktop.ConsoleKit.Seat.xml')
0 files changed, 0 insertions, 0 deletions