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/ede-make.srt | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'etc/srecode/ede-make.srt')
| -rw-r--r-- | etc/srecode/ede-make.srt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index f12744e89b7..36bae085cc9 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt | |||
| @@ -26,10 +26,11 @@ set application "ede" | |||
| 26 | 26 | ||
| 27 | context file | 27 | context file |
| 28 | 28 | ||
| 29 | template ede-empty :file | 29 | template ede-empty :file :project |
| 30 | ---- | 30 | ---- |
| 31 | # Automatically Generated {{FILE}} by EDE. | 31 | # Automatically Generated {{FILE}} by EDE. |
| 32 | # For use with: {{MAKETYPE}} | 32 | # For use with: {{MAKETYPE}} |
| 33 | # Relative File Name: {{PROJECT_FILENAME}} | ||
| 33 | # | 34 | # |
| 34 | # DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST. | 35 | # DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST. |
| 35 | # EDE is the Emacs Development Environment. | 36 | # EDE is the Emacs Development Environment. |