lintry

complete br

...@@ -19,4 +19,8 @@ new time ...@@ -19,4 +19,8 @@ new time
19 Br is new update 19 Br is new update
20 br update 20 br update
21 conflict solved 21 conflict solved
22 -conflict solved again
...\ No newline at end of file ...\ No newline at end of file
22 +conflict solved again
23 +
24 +
25 +
26 +完成br功能,合并到develop
...\ No newline at end of file ...\ No newline at end of file
......