From 147efc54ddb951cae1391e8a18763bfdc1f8f789 Mon Sep 17 00:00:00 2001
From: Selwin Ong <selwin.ong@gmail.com>
Date: Tue, 5 Feb 2019 18:05:42 +0700
Subject: Added anchor.js to docs

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index ab695b6..b218e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,10 @@ Vagrantfile
 .coverage*
 /.cache
 
+<<<<<<< HEAD
 .pytest_cache/
+=======
+Gemfile
+Gemfile.lock
+_site/
+>>>>>>> 600be0a... Added anchor.js to docs
-- 
cgit v1.2.1