From 7806afc628a3894f3a1087df33c9b1baf00848ff Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 4 Jan 2020 22:11:35 -0800 Subject: [PATCH] Fix compilation error after merge --- .gitignore | 1 + .../vision/pipeline/pipes/GroupContoursPipe.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3cccab404..d0271ff8d 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ New client/chameleon-client/* *.prefs *.jfr .DS_Store +*.iml diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java index 78639ffc1..e0a9d9e2a 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java @@ -84,10 +84,10 @@ public class GroupContoursPipe implements Pipe, List