From a1e2026759ce58cdf039781582a0647d8f1bfb8c Mon Sep 17 00:00:00 2001
From: Daniela Arcese <dnarcese@gmail.com>
Date: Sun, 4 Jun 2017 19:06:58 -0400
Subject: [PATCH] add bundle.js back to gitignore

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1352cb25..2ff1484e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
 .DS_Store
 node_modules
-<<<<<<< HEAD
-<<<<<<< HEAD
 public/bundle.js
-=======
->>>>>>> add gitignore
-=======
->>>>>>> d7e40776401060de6d84771a442ddb6f3ea7175d
 static/*
 !static/info.txt