diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-31 00:32:14 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-31 00:32:14 +0000 |
| commit | 6af314f0fa0214908264d0fb95286c64e4d0f982 (patch) | |
| tree | 4e036a07a88c1c8e7d5d07241c055a163b0049cb /po | |
| parent | ee2ed63a9dd2a6f21704a70c06389d92c2d6c4a0 (diff) | |
| download | anaconda-6af314f0fa0214908264d0fb95286c64e4d0f982.tar.gz anaconda-6af314f0fa0214908264d0fb95286c64e4d0f982.tar.xz anaconda-6af314f0fa0214908264d0fb95286c64e4d0f982.zip | |
fixup conflict
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -12,9 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"<<<<<<< fr.poPOT-Creation-Date: 2003-05-28 21:50-0400\n" -"=======POT-Creation-Date: 2003-07-08 00:11-0400\n" -">>>>>>> 1.92Last-Translator: Audrey Simons <asimons@redhat.com>\n" +"Last-Translator: Audrey Simons <asimons@redhat.com>\n" "X-Generator: KBabel 1.0\n" #: ../anaconda:97 |