]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'example-named-files'
authorMark Otto <otto@github.com>
Sat, 27 Jul 2013 03:43:22 +0000 (20:43 -0700)
committerMark Otto <otto@github.com>
Sat, 27 Jul 2013 03:43:22 +0000 (20:43 -0700)
Conflicts:
.gitignore

1  2 
.gitignore

diff --cc .gitignore
index 218ceb9f3325f872dde992670fbb26b3ffd02e6d,8c843cb4af0b28e557fbf7576e5f2b2194de1b8a..b6f967d8070be2461dbf6621635c1aa0e6199435
@@@ -39,4 -34,4 +35,3 @@@ nbprojec
  .CVS
  .idea
  node_modules
--dist