diff options
Diffstat (limited to 'src/starter/confread.h')
| -rw-r--r-- | src/starter/confread.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/starter/confread.h b/src/starter/confread.h index ba17d0b9a..4f9c5f7d0 100644 --- a/src/starter/confread.h +++ b/src/starter/confread.h @@ -64,10 +64,7 @@ struct starter_end { char *ca; char *ca2; char *groups; -<<<<<<< HEAD -======= char *cert_policy; ->>>>>>> upstream/4.5.1 char *iface; ip_address addr; u_int ikeport; @@ -129,10 +126,7 @@ struct starter_conn { u_int32_t reqid; mark_t mark_in; mark_t mark_out; -<<<<<<< HEAD -======= u_int32_t tfc; ->>>>>>> upstream/4.5.1 sa_family_t addr_family; sa_family_t tunnel_addr_family; bool install_policy; |