diff options
| author | Mark Otto <[email protected]> | 2011-06-28 10:47:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 10:47:26 -0700 |
| commit | 80abe21189992f165ff8c7091743bda727adfedd (patch) | |
| tree | e46bd1afca3c355e235ca31a96437cd7707a46bb /lib/forms.less | |
| parent | 68f421eac7d71d3815b394efbefe2abafc30c6a5 (diff) | |
| parent | e33808447e13f340755861f389d7b4db4557f10c (diff) | |
| download | bootstrap-80abe21189992f165ff8c7091743bda727adfedd.tar.xz bootstrap-80abe21189992f165ff8c7091743bda727adfedd.zip | |
resolve conflict in patterns from modals
Diffstat (limited to 'lib/forms.less')
0 files changed, 0 insertions, 0 deletions