From cbe051a09c19f868b7682477755011ec681ce6cb Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Mon, 13 May 2019 08:30:57 -0700
Subject: Re-enabled conformance tests.

---
 WORKSPACE | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'WORKSPACE')

diff --git a/WORKSPACE b/WORKSPACE
index 254d113..4239c71 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -17,8 +17,11 @@ http_archive(
 
 git_repository(
     name = "com_google_protobuf",
-    commit = "ec1a70913e5793a7d0a7b5fbf7e0e4f75409dd41",
-    remote = "https://github.com/protocolbuffers/protobuf.git",
+    # TODO(haberman): update to protobuf branch oncd this is merged:
+    #   https://github.com/protocolbuffers/protobuf/pull/6126
+    #remote = "https://github.com/protocolbuffers/protobuf.git",
+    commit = "2996da4d817dd006cd8599c74ad2364a897d6107",
+    remote = "https://github.com/haberman/protobuf.git",
 )
 
 http_archive(
-- 
cgit v1.2.3