From 7d347800b2d918ecb7559e1a7997a4a2ece37bd7 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Fri, 21 Feb 2014 12:05:27 +0100
Subject: [PATCH] Fix merge

---
 .../main/java/org/sonar/api/utils/WorkDurationFactory.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java
index 62d31571f62..b86ee4fbf96 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java
@@ -63,11 +63,4 @@ public final class WorkDurationFactory implements BatchComponent, ServerComponen
     return settings.getInt(CoreProperties.HOURS_IN_DAY);
   }
 
-  /**
-   * @since 4.3
-   */
-  public WorkDuration createFromSeconds(long durationInSeconds) {
-    return WorkDuration.createFromSeconds(durationInSeconds, hoursInDay);
-  }
-
 }
-- 
2.39.5