Merge pull request #2003 from Tyriar/fix_merge_problem

Fix compile error from conflicting PRs

src/renderer/dom/DomRendererRowFactory.ts

@@ -84,7 +84,7 @@ export class DomRendererRowFactory {
         charElement.classList.add(ITALIC_CLASS);
       }
 
-      if (flags & FLAGS.DIM) {
+      if (this._workCell.isDim()) {
         charElement.classList.add(DIM_CLASS);
       }