]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
Remove the conflict
authorBrandon Arnold <brandon@zurb.com>
Fri, 5 Sep 2014 23:35:08 +0000 (16:35 -0700)
committerBrandon Arnold <brandon@zurb.com>
Fri, 5 Sep 2014 23:35:08 +0000 (16:35 -0700)
commit542501465f1df52f404a4c82f5d25d0d720f8be4
tree0df5b857f2432ecda8056f0832315fb01d5d0564
parent3b51e41088ad1637ef8f5e09d159a886a5dfd526
parentec17da700eb8ba39f462180090d9ec7dbad3e3ec
Remove the conflict
scss/foundation/components/_switches.scss