github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

A "HEAD" word remaining from a merge conflict was accidentally left

Browse Source 
in... removing it
This commit is contained in:
Jaime Casanova
2011-06-10 21:16:07 -05:00
parent 1d05467df1
commit 3f4ff5a862
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@@ -170,8 +170,6 @@ parse_line(char *buff, char *name, char *value)
trim(value); trim(value);
} }
<<<<<<< HEAD:config.c
bool bool
reload_configuration(char *config_file, t_configuration_options *orig_options) reload_configuration(char *config_file, t_configuration_options *orig_options)
{ {