fixed .travis.yml conflict

jrgifford · jrgifford · commit fd37393bf374 · 2013-01-11T15:35:09.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,5 +6,6 @@ notifications:
   email:
     - tobias.pfeiffer@student.hpi.uni-potsdam.de
     - james+travis-ci-broken@jamesrgifford.com
+    - kh@kalonhinds.com
   irc: "irc.freenode.org#hacketyhack"
 
