From 3df29e68069ad170a4a813081b7354be10d0d9e8 Mon Sep 17 00:00:00 2001
From: Commander-lol <ljcapitanio@gmail.com>
Date: Tue, 3 Mar 2015 20:03:34 +0000
Subject: [PATCH] Fixed Broken Merge

---
 js/tinyDOM.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/js/tinyDOM.js b/js/tinyDOM.js
index 38c7cd0..0067b8a 100644
--- a/js/tinyDOM.js
+++ b/js/tinyDOM.js
@@ -1,10 +1,5 @@
 /*global Element, CustomEvent, HTMLElement */
-<<<<<<< HEAD
-/*jslint plusplus: true */
-/*jslint nomen: true*/
-=======
 /*jslint plusplus: true, nomen: true*/
->>>>>>> origin/master
 
 (function () {
     'use strict';
@@ -195,7 +190,6 @@
         }
         return is;
     };
-<<<<<<< HEAD
 
     tinyDOM.isJson = function (obj) {
         try {
@@ -205,8 +199,6 @@
             return false;
         }
     };
-=======
->>>>>>> origin/master
 
 	tinyDOM.exists = function (obj) {
 		return obj !== null && typeof (obj) !== 'undefined';
-- 
GitLab