#74 -- fix merge

src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java

@@ -11,7 +11,7 @@ public class AddRuleForm {
     public AddRuleForm() {
     }
 
-    public AddRuleForm(Rule rule) {
+    public AddRuleForm(DbRule rule) {
         this.ruleId = rule.getId();
         this.firstAntecedentId = rule.getFirstAntecedent().name();
         this.secondAntecedentId = rule.getSecondAntecedent().name();

src/main/java/ru/ulstu/extractor/rule/service/RuleService.java

@@ -45,7 +45,7 @@ public class RuleService {
         }
     }
 
-    public Rule findById(Integer id) {
+    public DbRule findById(Integer id) {
         return ruleRepository.getOne(id);
     }