Renamed directory themes/portlandia/scss/ to themes/portlandia/sass/
Insignificant merge conflict fixed.
Renamed directory themes/portlandia/scss/ to themes/portlandia/sass/.