aboutsummaryrefslogtreecommitdiff
path: root/elisp/emms-player-xine.el
diff options
context:
space:
mode:
authorDaniel <[email protected]>2024-01-18 05:07:48 -0500
committerDaniel <[email protected]>2024-01-18 05:07:48 -0500
commit4d4e304446e45e0353ffc712ccaabcc4a426b1ff (patch)
tree25577ddb3804d70923666ce21492ee21da34fd44 /elisp/emms-player-xine.el
parent78fea8944aeb3b3659fc6294bd769776368fce26 (diff)
fix merge conflict
Diffstat (limited to 'elisp/emms-player-xine.el')
0 files changed, 0 insertions, 0 deletions