diff options
| author | Joakim Verona | 2013-03-26 15:31:46 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 15:31:46 +0100 |
| commit | e11705b616777a8a72363b2037d989987630e863 (patch) | |
| tree | fda56011e9ac37da9e53762d8dc24c7a87cbee82 /etc/tutorials/TUTORIAL.th | |
| parent | c446797d60edf1058f6cbec28e57255d245dd47b (diff) | |
| parent | cded56c19b30e038537398b5213438c339428ed9 (diff) | |
| download | emacs-e11705b616777a8a72363b2037d989987630e863.tar.gz emacs-e11705b616777a8a72363b2037d989987630e863.zip | |
conflict resolve
Diffstat (limited to 'etc/tutorials/TUTORIAL.th')
| -rw-r--r-- | etc/tutorials/TUTORIAL.th | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th index 7906b6cf409..e313fc71a59 100644 --- a/etc/tutorials/TUTORIAL.th +++ b/etc/tutorials/TUTORIAL.th | |||
| @@ -1001,6 +1001,6 @@ virach@nectec.or.th | |||
| 1001 | Translate - January 1999 by Virach Sornlertlamvanich | 1001 | Translate - January 1999 by Virach Sornlertlamvanich |
| 1002 | 1002 | ||
| 1003 | ;;; Local Variables: | 1003 | ;;; Local Variables: |
| 1004 | ;;; sentence-end-double-space: nil | 1004 | ;;; sentence-end-double-space: nil |
| 1005 | ;;; coding: iso-2022-7bit | ||
| 1005 | ;;; End: | 1006 | ;;; End: |
| 1006 | |||