diff options
Diffstat (limited to 'src/libstrongswan/utils/hashtable.c')
| -rw-r--r-- | src/libstrongswan/utils/hashtable.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/libstrongswan/utils/hashtable.c b/src/libstrongswan/utils/hashtable.c index 9a0f92b3c..49b0bb68c 100644 --- a/src/libstrongswan/utils/hashtable.c +++ b/src/libstrongswan/utils/hashtable.c @@ -186,11 +186,7 @@ static void rehash(private_hashtable_t *this) linked_list_t **old_table; u_int row, old_capacity; -<<<<<<< HEAD - if (this->capacity < MAX_CAPACITY) -======= if (this->capacity >= MAX_CAPACITY) ->>>>>>> upstream/4.5.1 { return; } @@ -253,10 +249,7 @@ METHOD(hashtable_t, put, void*, { old_value = pair->value; pair->value = value; -<<<<<<< HEAD -======= pair->key = key; ->>>>>>> upstream/4.5.1 break; } } |