User: islandusurper Branch: HEAD Date: Mon, 15 Feb 2010 19:23:15 +0000 Modified files: /modules/ubercart/uc_catalog uc_catalog.admin.inc uc_catalog.install uc_catalog.module /modules/ubercart/uc_product_kit uc_product_kit.module Log message: Resolve conflict with taxonomy table name change. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_catalo... http://cvs.drupal.org/diff.php?path=contributions/modules/ubercart/uc_produc...