Merge remote-tracking branch 'jasonseney/scss-multiline'

iabw · Oct 12, 2014 · b2f3a8b · b2f3a8b
2 parents 2a20ffa + 4819f56
commit b2f3a8b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/docker.js b/src/docker.js
@@ -949,7 +949,7 @@ Docker.prototype.languages = {
   },
   scss: {
     extensions: [ 'scss' ],
-    comment: '//' //, multiLine: [ /\/\*/, /\*\// ]
+    comment: '//', multiLine: [ /\/\*\*?/, /\*\// ], jsDoc: true
   },
   make: {
     names: [ 'makefile' ],