owners owners.list,1.646,1.647

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4844

Modified Files:
	owners.list 
Log Message:
clean up my mess :(



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -r1.646 -r1.647
--- owners.list	17 Feb 2006 02:21:14 -0000	1.646
+++ owners.list	17 Feb 2006 02:32:59 -0000	1.647
@@ -136,17 +136,12 @@
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-<<<<<<< owners.list
-Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.net|extras-qa at fedoraproject.org|
-=======
 Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cpanspec|RPM spec file generation utility|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
->>>>>>> 1.645
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|dwmw2 at infradead.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -353,15 +348,10 @@
 Fedora Extras|gonvert|Units conversion utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
-<<<<<<< owners.list
-Fedora Extras|gpa|Graphical user interface for GnuPG|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.net|extras-qa at fedoraproject.org|
-=======
 Fedora Extras|gpa|Graphical user interface for GnuPG|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
->>>>>>> 1.645
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
@@ -492,22 +482,14 @@
 Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org|
-<<<<<<< owners.list
-Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at ausil.net|extras-qa at fedoraproject.org|
-=======
 Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|jcarpenter at condell.org|extras-qa at fedoraproject.org|
->>>>>>> 1.645
 Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-<<<<<<< owners.list
-Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.net|extras-qa at fedoraproject.org|
-=======
 Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker|A Mac OSX style docker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker-resources|Plugins, Sounds, and Themes for kxdocker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
->>>>>>> 1.645
 Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|