Anton Romanov 900cfdd036 Merge branch 'master' into 3-parse-rule ...

# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html

2025-02-24 21:42:35 +04:00

..

test.yaml

Merge branch 'master' into 3-parse-rule

2025-02-24 21:42:35 +04:00