Author: [log in to unmask] Date: Thu Jan 1 23:23:18 2015 New Revision: 1828 Log: Remove the COMBINE enum as a ConditionsSeries should be used instead. Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/MultipleCollectionsAction.java Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/MultipleCollectionsAction.java ============================================================================= --- java/trunk/conditions/src/main/java/org/hps/conditions/database/MultipleCollectionsAction.java (original) +++ java/trunk/conditions/src/main/java/org/hps/conditions/database/MultipleCollectionsAction.java Thu Jan 1 23:23:18 2015 @@ -9,6 +9,5 @@ LAST_UPDATED, LAST_CREATED, LATEST_RUN_START, - COMBINE, ERROR }