diff options
| author | Romain Francoise | 2008-10-12 09:17:13 +0000 |
|---|---|---|
| committer | Romain Francoise | 2008-10-12 09:17:13 +0000 |
| commit | 69d31e51835237e7de0881d202cd2a66b446f45a (patch) | |
| tree | 6f4ed502094644dad62f8a1c1740faa3c6cc5182 /src/data.c | |
| parent | 864c974046643cafbd269cf3d8dd62a6125395ee (diff) | |
| download | emacs-69d31e51835237e7de0881d202cd2a66b446f45a.tar.gz emacs-69d31e51835237e7de0881d202cd2a66b446f45a.zip | |
Delete leftover conflict markers.
Diffstat (limited to 'src/data.c')
0 files changed, 0 insertions, 0 deletions