[csw-devel] SF.net SVN: gar:[11414] csw/mgar/gar/v2/lib/python/patch_package.py

[wahwah at users.sourceforge.net]

Revision: 11414
          http://gar.svn.sourceforge.net/gar/?rev=11414&view=rev
Author:   wahwah
Date:     2010-10-26 09:33:38 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
mGAR v2: patchpkg, the surgeon class moved to package.py

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/patch_package.py

Modified: csw/mgar/gar/v2/lib/python/patch_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/patch_package.py	2010-10-26 09:33:13 UTC (rev 11413)
+++ csw/mgar/gar/v2/lib/python/patch_package.py	2010-10-26 09:33:38 UTC (rev 11414)
@@ -69,7 +69,6 @@
     pprint.pprint(new_filename)
 
 
->>>>>>> mGAR v2: patchpkg, new function to compose package names.
 def main():
   parser = optparse.OptionParser()
   parser.add_option("--srv4-file", "-s", dest="srv4_file",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.