RED-9472:
solving merge conflicts
This commit is contained in:
parent
f31d9170f8
commit
482cad2a46
@ -83,7 +83,7 @@ public class RulesController implements RulesResource {
|
||||
mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules();
|
||||
} catch (FeignException e) {
|
||||
if (e.status() == HttpStatus.BAD_REQUEST.value()) {
|
||||
throw new BadRequestException("The provided rule string is not a valid drools rule file!");
|
||||
throw new BadRequestException("The provided rule file is not a valid drools rule file!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user