summaryrefslogtreecommitdiff
path: root/src/checkout.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/checkout.c')
-rw-r--r--src/checkout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c
index 662803725..76edc6a72 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -1694,7 +1694,6 @@ done:
static int checkout_create_conflicts(checkout_data *data)
{
- git_vector conflicts = GIT_VECTOR_INIT;
checkout_conflictdata *conflict;
size_t i;
int error = 0;