From: Jonathan Chu <jonathan.chu@me.com>
Date: Fri, 12 Feb 2016 03:03:05 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6ac648f033c440f6717f490745859344dfde41ab;p=gitignore.git

Merge remote-tracking branch 'upstream/master'
---

6ac648f033c440f6717f490745859344dfde41ab
diff --cc Global/Emacs.gitignore
index f4e7fe79,95e09eba..43632ff1
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@@ -31,5 -31,5 +31,8 @@@ tram
  # cask packages
  .cask/
  
 +# Flycheck
 +flycheck_*.el
++
+ # server auth directory
+ /server/