Solved conflicts

Author: aliciavr

ups/product_deps

@@ -252,8 +252,14 @@ wpdir   product_dir     wire-cell-cfg
 #   entry to match for a given product.
 #
 ####################################
+#product		version		qual	flags		<table_format=2>
+#sbncode		v09_93_01_01       -
+#cetmodules	v3_24_01	-	only_for_build
+#sbnd_data	v01_25_00	-	optional
+#sbndutil	v09_93_01_01	-	optional
+#end_product_list
 product		version		qual	flags		<table_format=2>
-sbncode		v09_93_01_02       -
+sbncode		v09_93_01_02    -
 cetmodules	v3_24_01	-	only_for_build
 sbnd_data	v01_26_00	-	optional
 sbndutil	v09_93_01_02	-	optional