Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

31610258 · Mark Otto · c6af78e8 · 4e8f769d · 31610258
Commit 31610258 authored Jan 03, 2015 by Mark Otto
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

scss/_mixins.scss scss/_mixins.scss +1 -1

No files found.
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -3,7 +3,7 @@

 // Toggles
 //
-// Used in conjuntion with global variables to enable certain theme features.
+// Used in conjunction with global variables to enable certain theme features.

 @mixin border-radius($radius: $border-radius-base) {
  @if $enable-rounded {