From 1a26940490f0c60dd1f7f632fd793929f10ba723 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Thu, 22 Jun 2017 10:36:43 -0300
Subject: [PATCH] merge

---
 Gopkg.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 0c723ea05..93ed8b013 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -100,6 +100,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "d6da23d2c5d62fbc0e9d6effeeea88169d4c5add4eb620087f17af4853a41cc4"
+  inputs-digest = "15a60b1efa147cc2507589fd45e4b767e118c6853c6ae2e2728a6ba01b818fe4"
   solver-name = "gps-cdcl"
   solver-version = 1