diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/filelock.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/filelock.c b/src/filelock.c index 02c5eb05ac9..6ef3a4973d5 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -743,5 +743,3 @@ syms_of_filelock (void) | |||
| 743 | #endif | 743 | #endif |
| 744 | } | 744 | } |
| 745 | 745 | ||
| 746 | /* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1 | ||
| 747 | (do not change this comment) */ | ||