Fix an off-by-one error. Make the popover work correctly when conflicts occur.

[enjoyable.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index dbcf904..0c48425 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,6 @@ xcuserdata
 profile
 *.moved-aside
 .DS_Store
+*.helpindex
+*~