From c39d2e8cc4245d92826b027c3cb115f6301fc2b6 Mon Sep 17 00:00:00 2001
From: Frank Natividad <franknatividad@google.com>
Date: Thu, 4 Oct 2018 17:14:38 -0700
Subject: [PATCH] Undo change in storage.ts

---
 system-test/storage.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/system-test/storage.ts b/system-test/storage.ts
index 7fcfc6a488..0b32192ac5 100644
--- a/system-test/storage.ts
+++ b/system-test/storage.ts
@@ -1847,16 +1847,12 @@ describe('storage', () => {
 
       it('should not download from the unencrypted file', done => {
         unencryptedFile.download(err => {
-<<<<<<< HEAD
-          assert(err!.message.indexOf([
-=======
           if (!err) {
             done(new Error('Expected an error.'));
             return;
           }
 
-          assert(err.message.indexOf([
->>>>>>> TypeScript stuff.
+          assert(err!.message.indexOf([
             'The target object is encrypted by a',
             'customer-supplied encryption key.',
           ].join(' ')) > -1);