From b0aecb12794c3c85b660ff7e828dc8d5d8c2eef4 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 5 Dec 2014 17:24:46 +0100 Subject: [PATCH] Fix merge --- .../src/main/java/org/sonar/api/web/CodeColorizerFormat.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java index 0fb1abaa864..4b258d2096c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java @@ -20,12 +20,8 @@ package org.sonar.api.web; import com.google.common.base.Objects; -<<<<<<< HEAD import org.sonar.api.source.Highlightable; import org.sonar.api.task.TaskExtension; -======= -import org.sonar.api.ServerExtension; ->>>>>>> origin/branch-4.5 import org.sonar.colorizer.Tokenizer; import java.util.List; -- 2.39.5