Fix up errors from mass manual conflict resolution

This commit is contained in:
Derek S. Ray
2015-04-06 17:18:48 -04:00
parent 4494b328f0
commit aac78fe62e
+4
View File
@@ -2204,6 +2204,10 @@ tty_putstr(window, attr, str)
cw->data[cw->cury-1][++i] = '\0';
tty_putstr(window, attr, &str[i]);
}
}
break;
}
}
}
break;