# HG changeset patch
# User smith@nwoca.org
# Date 1370361089 -3600
# Node ID 2a4ea22a6dd368c98db68fec6453cf3b287b891f
# Parent  b2532280341e7b5f3148fd253a32c771af150560# Parent  37e527f414c47a54e09b473c82d6350cbaf01505
merge

diff -r b2532280341e -r 2a4ea22a6dd3 hg-notify-subscriptions.rc
--- a/hg-notify-subscriptions.rc	Tue Jun 04 16:50:46 2013 +0100
+++ b/hg-notify-subscriptions.rc	Tue Jun 04 16:51:29 2013 +0100
@@ -1,8 +1,7 @@
 [usersubs]
 # key is subscriber email, value is comma-separated list of repo glob patterns
 smith@nwoca.org = *
-diemer@nwoca.org = *USAS*
-diemer@nwoca.org = *Common*
+diemer@nwoca.org = *USAS*,*Common*
 calmes@nwoca.org = *USPS*
 
 [reposubs]