commit e9762c433ba1a2793f06d1a30ecdc7452e20db1f
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> Mon Sep 10 06:02:13 2018 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> Mon Sep 10 06:02:13 2018 -0400
tree 993535fe9d1c3ed0ded0b537e07c03f54a254c05
parent d7597f93ef70e3fdcb95684287816735344242ba
parent cbbab83e99c3fa44b6ff37863cbd7bb3e9f84f47

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update Gerrit API to 2.14.12

Change-Id: I694807c3fe45f403767d62609047d1dab79c79e0

gerrit_api.bzl

diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index ceb9288..98be00b 100644
--- a/gerrit_api.bzl
+++ b/gerrit_api.bzl
@@ -13,18 +13,30 @@
     maven_jar(
         name = "gerrit_plugin_api",
         artifact = "com.google.gerrit:gerrit-plugin-api:" + VER,
+<<<<<<< HEAD
         sha1 = "ff44f3b4faa9d7b8845f68e3340b72d800958e7e",
+=======
+        sha1 = "2056c3cd210bc500940fa2629191c90b470ea0d1",
+>>>>>>> stable-2.14
     )
     maven_jar(
         name = "gerrit_plugin_gwtui",
         artifact = "com.google.gerrit:gerrit-plugin-gwtui:" + VER,
+<<<<<<< HEAD
         sha1 = "795c35ad561f4e78d5ac582e7d7d23bdc5363052",
+=======
+        sha1 = "dd3d650ddbeb9aba32781bc6124dbe9bc5b275c9",
+>>>>>>> stable-2.14
         exclude = ["com/google/gwt/*"],
     )
     maven_jar(
         name = "gerrit_acceptance_framework",
         artifact = "com.google.gerrit:gerrit-acceptance-framework:" + VER,
+<<<<<<< HEAD
         sha1 = "9b55aa8a1184ed9ffe4ac982e1ceb069249783f7",
+=======
+        sha1 = "790327f96485afabfa158a88aac7a59fde1591e8",
+>>>>>>> stable-2.14
     )
     native.bind(
         name = "gerrit-plugin-api",