fixing conflict

2020-03-29 15:26:13 +02:00
parent b86fa45dc1 ba6f94580d
commit 20d902915e
3 changed files with 440 additions and 24 deletions
--- a/st.h
+++ b/st.h
@ -81,6 +81,8 @@ void die(const char *, ...);
 void redraw(void);
 void draw(void);

+void kscrolldown(const Arg *);
+void kscrollup(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);