From d4a4aebb9a8c38b22f8b88fba2fdad5ce189b096 Mon Sep 17 00:00:00 2001
From: Andrew Martinez <andrew.p.martinez@gmail.com>
Date: Mon, 19 Oct 2020 10:00:15 -0400
Subject: [PATCH] ignore .idea folder, go to 1.15

---
 .gitignore  | 1 +
 .travis.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3bcd8cb..15a552f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.swp
 /bin/
 cover.out
+/.idea
diff --git a/.travis.yml b/.travis.yml
index 257dfdf..c2282b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ go_import_path: go.etcd.io/bbolt
 sudo: false
 
 go:
-- 1.12
+- 1.15
 
 before_install:
 - go get -v honnef.co/go/tools/...