On Thu, Jun 17, 2010 at 05:36:31AM +0000, Chris Curran wrote:
silly git merge....
en-US/Storage_Pools_Partitions.xml.orig | 360 -------------------------------
1 files changed, 0 insertions(+), 360 deletions(-)
In case anyone's interested, you can add a .gitignore file in the root
of your module to block git from worrying about files like *.orig or
backup files that might be created by different editors. You can also
do this inside a subfolder to only ignore things in that part of a
tree.
http://book.git-scm.com/4_ignoring_files.html
--
Paul W. Frields
http://paul.frields.org/
gpg fingerprint: 3DA6 A0AC 6D58 FEC4 0233 5906 ACDB C937 BD11 3717
http://redhat.com/ - - - -
http://pfrields.fedorapeople.org/
Where open source multiplies:
http://opensource.com