Fixed git conflict.

1 files changed, 2 insertions, 0 deletions

diff --git a/snac.h b/snac.h
index de2ee1e..91033cf 100644
--- a/snac.h
+++ b/snac.h
@@ -29,6 +29,8 @@ extern int dbglevel;
 
 #define L(s) (s)
 
+#define POSTLIKE_OBJECT_TYPE "Note|Question|Page|Article|Video|Event"
+
 int mkdirx(const char *pathname);
 
 int valid_status(int status);