diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-05 13:10:17 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-05 13:10:17 -0500 |
commit | 2025ac02553ad74d8409a6343b4f495227014dbb (patch) | |
tree | 8ad8f9249428875d4279ffb5f488ed850a33251a /data/Makefile.am | |
parent | 2bef44d4c6a4f184c17c681185f31972d3a84914 (diff) | |
download | ayatana-indicator-messages-2025ac02553ad74d8409a6343b4f495227014dbb.tar.gz ayatana-indicator-messages-2025ac02553ad74d8409a6343b4f495227014dbb.tar.bz2 ayatana-indicator-messages-2025ac02553ad74d8409a6343b4f495227014dbb.zip |
fix merge error
Diffstat (limited to 'data/Makefile.am')
0 files changed, 0 insertions, 0 deletions