diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /etc/srecode/c.srt | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'etc/srecode/c.srt')
| -rw-r--r-- | etc/srecode/c.srt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt index 6c7139f3184..479f5c9b33d 100644 --- a/etc/srecode/c.srt +++ b/etc/srecode/c.srt | |||
| @@ -46,12 +46,12 @@ template empty :time :user :file :c | |||
| 46 | 46 | ||
| 47 | template header_guard :file :blank | 47 | template header_guard :file :blank |
| 48 | ---- | 48 | ---- |
| 49 | #ifndef {{FILENAME_SYMBOL}} | 49 | #ifndef {{FILENAME_SYMBOL:upcase}} |
| 50 | #define {{FILENAME_SYMBOL}} 1 | 50 | #define {{FILENAME_SYMBOL:upcase}} 1 |
| 51 | 51 | ||
| 52 | {{^}} | 52 | {{^}} |
| 53 | 53 | ||
| 54 | #endif // {{FILENAME_SYMBOL}} | 54 | #endif // {{FILENAME_SYMBOL:upcase}} |
| 55 | ---- | 55 | ---- |
| 56 | 56 | ||
| 57 | context misc | 57 | context misc |