Update .gitignore

Author: timkpaine

.gitignore

@@ -115,23 +115,21 @@ ENV/
 # Thumbnails
 ._*
 
-<<<<<<< before updating
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
 .fseventsd
 .Spotlight-V100
 .TemporaryItems
 .Trashes
 .VolumeIcon.icns
-=======
+
 # Documentation
 /site
 index.md
 docs/_build/
 docs/src/_build/
 docs/api
 docs/index.md
->>>>>>> after updating
 
 # Directories potentially created on remote AFP share
 .AppleDB