resolved

[2016-12-18 20:51:48] Mark Otto made changes to /bootstrap-1.3.0.css, /bootstrap-1.3.0.min.css, /docs/index.html, /docs/javascript.html, /js/bootstrap-modal.js, /lib/patterns.less: resolved conflict link