From 86ad628e16f4ca5e75d1980b84cc7f740a6604c6 Mon Sep 17 00:00:00 2001
From: Magnus Feuer <mfeuer@jaguarlandrover.com>
Date: Fri, 5 Jun 2015 11:45:06 -0700
Subject: Converted dlink_tcp to JSON. Updated mod in prep for test1
 deployment. Modified JSON processing. Updated config to only load BT and bert
 modules.

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 78840ac..1801530 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
-<<<<<<< HEAD
 ebin
 deps
 .eunit
 *.o
 *.beam
 *.plt
+*.pyc
+*~
 erl_crash.dump
 rel/example_project
 .concrete/DEV_MODE
-- 
cgit v1.2.1