aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorReuben Thomas2013-10-18 09:48:33 +0100
committerReuben Thomas2013-10-18 09:48:33 +0100
commit0fc459a3f1538ecb04505031939823e88a24be14 (patch)
treeaea0859a25944560c7f45ae67e4cc1d5ba298b0a /src/alloc.c
parentd64da4b71a0b928700e616977b90f1948bf1d1e8 (diff)
downloademacs-0fc459a3f1538ecb04505031939823e88a24be14.tar.gz
emacs-0fc459a3f1538ecb04505031939823e88a24be14.zip
Remove erroneously-committed merge comment.
Diffstat (limited to 'src/alloc.c')
0 files changed, 0 insertions, 0 deletions