aboutsummaryrefslogtreecommitdiff
path: root/src/accounts-service-user.vala
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2016-01-29 15:40:16 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2016-01-29 15:40:16 +0100
commit46f1c75cfbceb69a4f948e935e8661a904b0cf2e (patch)
tree5ff44bde7e9ad5125fe97af826b28b0e31f493f1 /src/accounts-service-user.vala
parent3df5a15f0c7924214c1ae5fbaa5eca32b5c2cd54 (diff)
parent12715ce7e03fec9544d7261c87aa9ddaa39b75ad (diff)
downloadayatana-indicator-sound-46f1c75cfbceb69a4f948e935e8661a904b0cf2e.tar.gz
ayatana-indicator-sound-46f1c75cfbceb69a4f948e935e8661a904b0cf2e.tar.bz2
ayatana-indicator-sound-46f1c75cfbceb69a4f948e935e8661a904b0cf2e.zip
fixed conflict
Diffstat (limited to 'src/accounts-service-user.vala')
0 files changed, 0 insertions, 0 deletions