Removes git diff stuff :/

This commit is contained in:
mrmrs 2014-09-17 03:22:15 -07:00
parent dc2a4fec7c
commit e0430bb373

View file

@ -54,11 +54,3 @@
.dtcol-l { display: table-column; }
.dtcolg-l { display: table-column-group; }
}
<<<<<<< HEAD
=======
>>>>>>> master