Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Madelyn Olson <[email protected]>
  • Loading branch information
madolson committed Apr 3, 2024
1 parent dbb3ecb commit 1b15ab2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -5588,7 +5588,7 @@ sds genRedisInfoString(dict *section_dict, int all_sections, int everything) {
"server_name:%s\r\n", SERVER_NAME,
"server_version:%s\r\n", SERVER_VERSION,
"redis_git_sha1:%s\r\n", serverGitSHA1(),
"redis_git_dirty:%i\r\n", strtol(redisGitDirty(),NULL,10) > 0,
"redis_git_dirty:%i\r\n", strtol(serverGitDirty(),NULL,10) > 0,
"redis_build_id:%s\r\n", serverBuildIdString(),
"redis_mode:%s\r\n", mode,
"os:%s", name.sysname,
Expand Down

0 comments on commit 1b15ab2

Please sign in to comment.