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.ko | |
| parent | c446797d60edf1058f6cbec28e57255d245dd47b (diff) | |
| parent | cded56c19b30e038537398b5213438c339428ed9 (diff) | |
| download | emacs-e11705b616777a8a72363b2037d989987630e863.tar.gz emacs-e11705b616777a8a72363b2037d989987630e863.zip | |
conflict resolve
Diffstat (limited to 'etc/tutorials/TUTORIAL.ko')
| -rw-r--r-- | etc/tutorials/TUTORIAL.ko | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko index 2fad098c501..78ea63ff9e0 100644 --- a/etc/tutorials/TUTORIAL.ko +++ b/etc/tutorials/TUTORIAL.ko | |||
| @@ -997,3 +997,6 @@ COPYING$(C@L6s4B(B $(CFD@O@;(B $(C@P0m(B $(C3-(B $(CHD?!(B GNU $(C@L8 | |||
| 997 | $(CAV=J=C?@(B. $(C@Z@/(B $(C<RGAF.?~>n8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(C<RGAF.?~>n(B | 997 | $(CAV=J=C?@(B. $(C@Z@/(B $(C<RGAF.?~>n8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(C<RGAF.?~>n(B |
| 998 | $(C9fGX8&(B ("$(C<R@/1G(B") $(C1Y@}GO4B5%(B $(C55?s=C4Y(B. | 998 | $(C9fGX8&(B ("$(C<R@/1G(B") $(C1Y@}GO4B5%(B $(C55?s=C4Y(B. |
| 999 | 999 | ||
| 1000 | ;;; Local Variables: | ||
| 1001 | ;;; coding: iso-2022-7bit | ||
| 1002 | ;;; End: | ||