From 4ec2cf3bd042a43eed1b46f80449893d149c1a7c Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 30 May 2018 00:16:02 +0000
Subject: crypto/x509: specify path to AIX certificate file

    Reviewed-on: https://go-review.googlesource.com/113179

From-SVN: r260908
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 319d2f5..76b5e57 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-290c93f08f4456f0552b0764e28573164e47f259
+572b19513766e9e5cc4aa8d984a89c93880726ba
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1