Merge branch 'master' of github.com:baotiao/pika

Conflicts: src/pika_admin.cc
damon008 · Jun 23, 2016 · ace75b0 · ace75b0
2 parents 7765cb8 + fdc86d9
commit ace75b0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/pika_admin.cc b/src/pika_admin.cc
@@ -1,5 +1,4 @@
 #include "slash_string.h"
-#include "rsync.h"
 #include "pika_conf.h"
 #include "pika_admin.h"
 #include "pika_server.h"