aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/dnd.el
diff options
context:
space:
mode:
authorReiner Steib <[email protected]>2005-05-20 17:47:03 +0000
committerReiner Steib <[email protected]>2005-05-20 17:47:03 +0000
commit57d8ef63ee3d246f4726c7f0c28173b31faad58e (patch)
treeb2c0fbe8be1d09e47ec2100a0300df786a8bbf2d /lisp/dnd.el
parent44a91a68ecab01fa130a3ad97fe070452b320c95 (diff)
Remove CVS conflict markers.
Diffstat (limited to 'lisp/dnd.el')
0 files changed, 0 insertions, 0 deletions