Merge branch 'newDev'

Conflicts: BetterBookmarks.sublime-settings
dusk125 · Feb 15, 2017 · 5ce102d · 5ce102d
2 parents 917d715 + 607acf2
commit 5ce102d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/BetterBookmarks.sublime-settings b/BetterBookmarks.sublime-settings
@@ -21,7 +21,7 @@
 	"default_layer": "bookmarks",
 	/*
 	 * Where, if anywhere, should BetterBookmarks show the user what layer they're on when they switch layers. This value can be any combination of the following possible values; you don't have to pick just one!
-    *
+	 *
 	 * Possible values:
 	 *    popup: Shows a popup with the name of the currently selected layer at the cursor location.
 	 *    temporary: Shows the layer name in the status bar for a brief amount of time.

diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Usage is simple because, basically, BetterBookmarks functions just like the nati
 	"default_layer": "bookmarks",
 	/*
 	 * Where, if anywhere, should BetterBookmarks show the user what layer they're on when they switch layers. This value can be any combination of the following possible values; you don't have to pick just one!
-     *
+	 *
 	 * Possible values:
 	 *    popup: Shows a popup with the name of the currently selected layer at the cursor location.
 	 *    temporary: Shows the layer name in the status bar for a brief amount of time.