Merge pull request #1557 from ISNIT0/master

Added return character
bower · Oct 6, 2014 · c9fb530 · c9fb530
2 parents 52a6836 + 836bcd0
commit c9fb530
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/templates/std/conflict.std b/templates/std/conflict.std
@@ -5,5 +5,6 @@
 {{/each}}
 {{/condense}}
 {{#unless saveResolutions}}
+
 Prefix the choice with ! to persist it to bower.json
 {{/unless}}