preventive conflict resolution to merge pietern/zset-mem
[redis.git] / src / version.h
1 #define REDIS_VERSION "2.1.4"