commit 41ae2215a84a727abb9f8eeca39f492ef9ee0d48
author Inderjot Kaur Ratol <inderjot.kaur.ratol@ericsson.com> Thu Feb 01 22:11:34 2018 -0500
committer Inderjot Kaur Ratol <inderjot.kaur.ratol@ericsson.com> Thu Feb 01 22:11:34 2018 -0500
tree e4362d04c792bd9907d103773965f416b48d7d73
parent cdc9dff03ec051c9bc2fee1a4366d61dea594a70

Fix the bad merge causing compilation error

Change-Id: I48608aa0385d4bb5c7037a2ab8df5563206643dc

src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java
index 8fcdc60..897d7aa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraClient.java
@@ -45,7 +45,7 @@
 
   @Inject
   public JiraClient(JiraConfig jiraConfig) throws MalformedURLException {
-    this(jiraConfig.getUrl(), jiraConfig.getUsername(), jiraConfig.getPassword());
+    this(jiraConfig.getJiraUrl(), jiraConfig.getUsername(), jiraConfig.getPassword());
   }
 
   /**