# Conflicts: # takeout/control/ordergetwork.cpp # takeout/takeout.pro # takeout/view/newfloatform.cpp # takeout/view/newmainform.cpp
