[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merge conflicts in .po files.
|
From: |
John McCabe-Dansted |
|
Subject: |
Merge conflicts in .po files. |
|
Date: |
Thu, 22 Feb 2007 22:31:30 +0900 |
Hi, I just updated to latest CVS and got merge conflicts in "po/de.po"
and "po/pspp.pot". Since I did not manually change these files, I
suspect they are automatically generated from something. Should they
really be in CVS?
--
John C. McCabe-Dansted
PhD Student
University of Western Australia
- Merge conflicts in .po files.,
John McCabe-Dansted <=