From 6155ed8b499c10bdd1f38bcb25866218bc388b7c Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Tue, 21 Aug 2018 15:01:07 -0700
Subject: Re-add amalgamation rules and remove google protobuf from Travis.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 053b130..56ab91c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ env:
     - UPB_TRAVIS_BUILD=bare
     - UPB_TRAVIS_BUILD=barejit
     - UPB_TRAVIS_BUILD=core32
-    - UPB_TRAVIS_BUILD=withprotobuf
     - UPB_TRAVIS_BUILD=lua
     - UPB_TRAVIS_BUILD=ndebug
     - UPB_TRAVIS_BUILD=coverage
-- 
cgit v1.2.3