summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSelwin Ong <selwin.ong@gmail.com>2019-02-05 18:05:42 +0700
committerSelwin Ong <selwin.ong@gmail.com>2019-02-05 18:06:43 +0700
commit147efc54ddb951cae1391e8a18763bfdc1f8f789 (patch)
tree06208caf3939db54577f749679d3f1e59f5e15c8 /.gitignore
parent4b8e6156448ef2e7fafd4cf22fc869bb66286995 (diff)
downloadrq-147efc54ddb951cae1391e8a18763bfdc1f8f789.tar.gz
Added anchor.js to docs
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
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