RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   22-Jun-2007 18:27:40
  Branch: HEAD                             Handle: 2007062217274000

  Modified files:
    rpm                     devtool.conf

  Log:
    ct.

  Summary:
    Revision    Changes     Path
    2.11        +0  -4      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.10 -r2.11 devtool.conf
  --- rpm/devtool.conf	22 Jun 2007 16:25:04 -0000	2.10
  +++ rpm/devtool.conf	22 Jun 2007 16:27:40 -0000	2.11
  @@ -9,11 +9,7 @@
       MODULE_TAG_ZLIB=""
   
   %checkout
  -<<<<<<< devtool.conf
  -    for name in $MODULE_NAMES $@; do
  -=======
       for name in $MODULE_NAMES "$@"; do
  ->>>>>>> 2.9
           release=MODULE_TAG_`echo ${name} | tr [a-z] [A-Z]`
           release=`eval echo \\$${release}`
           if [ ".${release}" = . ]; then
  @@ .