From a8995f1e6d8e7c14666731657087046834ea0ef4 Mon Sep 17 00:00:00 2001
From: "fariz.tumbuan" <13515050@std.stei.itb.ac.id>
Date: Sat, 7 Oct 2017 00:24:46 +0800
Subject: [PATCH] Layout halaman history sudah bener (Ada ===>HEAD yang ga
 kehapus)

---
 css/history.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/css/history.css b/css/history.css
index 6a45c56a..0154a7f0 100755
--- a/css/history.css
+++ b/css/history.css
@@ -40,8 +40,6 @@
 .history_menu > h3 {
 	margin: 5px 1px;
 }
-<<<<<<< HEAD
-=======
 
 #history_table_container {
 	overflow-y: auto;
-- 
GitLab