-
Conflicts: op_robot_tests/tests_files/brokers/netcast.robot op_robot_tests/tests_files/data/users.yaml
-
Conflicts: op_robot_tests/tests_files/data/brokers.yaml op_robot_tests/tests_files/data/users.yaml op_robot_tests/tests_files/initial_data.py
-
Conflicts: op_robot_tests/tests_files/brokers/etender.robot op_robot_tests/tests_files/brokers/netcast.robot op_robot_tests/tests_files/data/brokers.yaml op_robot_tests/tests_files/data/users.yaml op_robot_tests/tests_files/initial_data.py op_robot_tests/tests_files/singleItemTender.robot
-
Merging Yulia's last changes in my working branch