diff options
Diffstat (limited to 'src/libstrongswan/enum.c')
| -rw-r--r-- | src/libstrongswan/enum.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstrongswan/enum.c b/src/libstrongswan/enum.c index df6a73a81..5c811bd17 100644 --- a/src/libstrongswan/enum.c +++ b/src/libstrongswan/enum.c @@ -43,11 +43,7 @@ int enum_from_name(enum_name_t *e, char *name) { do { -<<<<<<< HEAD - int i, count = e->last - e->first; -======= int i, count = e->last - e->first + 1; ->>>>>>> upstream/4.5.1 for (i = 0; i < count; i++) { |