# Conflicts: # src/common/common.js # src/components/floor-plan/CanvasFrame.jsx # src/hooks/roofcover/useWallLineOffsetSetting.js # src/util/qpolygon-utils.js
# Conflicts: # src/common/common.js # src/components/floor-plan/CanvasFrame.jsx # src/hooks/roofcover/useWallLineOffsetSetting.js # src/util/qpolygon-utils.js