Describe: sync_20150323-10570-g260af67 Commit: 260af67068d212472ce8d4dab8c7ca2c59828586
Modifications:
x11/st/Makefile | 2 +
x11/st/patches/patch-scrollback | 369
-------------------------------
2 files changed, 2 insertions(+), 369 deletions(-)
delete mode 100644 x11/st/patches/patch-scrollback
Log messages:
mismerge
