diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-02-02 04:47:40 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-02-02 04:47:40 +0000 |
| commit | 849eb485c750bbd95dc9d19648523a28ad0801f6 (patch) | |
| tree | f034e25388a12bf91c0abdbed0a2b3b107c4fcce /etc/tutorials/TUTORIAL.ru | |
| parent | 7e14d905634fb54fd5f26e6c51d3427e44e77fb8 (diff) | |
| download | emacs-849eb485c750bbd95dc9d19648523a28ad0801f6.tar.gz emacs-849eb485c750bbd95dc9d19648523a28ad0801f6.tar.bz2 emacs-849eb485c750bbd95dc9d19648523a28ad0801f6.zip | |
Remove conflict marker and merged entries about re-generating config.in.
Diffstat (limited to 'etc/tutorials/TUTORIAL.ru')
0 files changed, 0 insertions, 0 deletions