Fixes conflicts

This commit is contained in:
Alberto Garcia Cabeza
2015-08-06 20:58:54 +02:00

View File

@@ -756,7 +756,6 @@ form {
}
}
// 10. Alerts
// - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -786,5 +785,3 @@ form {
color: $alert-color;
}
}