When merging branches there are usually conflicts with the CSS sourcemaps. It's not an issue to just recompile the CSS to generate a new sourcemap but having the file ignored helps to save an unnecessary step.pull/1213/head
@@ -1 +1,2 @@ | |||
.sass-cache | |||
*.css.map |