From 0ae438f38ae75722e6ae07645c3d95d69f56d701 Mon Sep 17 00:00:00 2001
From: Jennifer Dutton <jduttondesign@gmail.com>
Date: Sat, 3 Dec 2016 11:19:12 -0600
Subject: [PATCH] fixed merge conflict

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27b1935..b9aedcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*.DS_Store
+.DS_Store
 lib/node_modules/
 lib/bower_components/
-*javascripts/AppConstants.js
+javascripts/AppConstants.js
 npm-debug.log