Resolved conflict in docker ingore
Resolved conflict in docker ingore

zdw/xos,zdw/xos,zdw/xos,open-cloud/xos,open-cloud/xos,cboling/xos,open-cloud/xos,opencord/xos,cboling/xos,cboling/xos,opencord/xos,opencord/xos,cboling/xos,cboling/xos,zdw/xos