# Conflicts: # config.gradle # delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java # print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java # print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
