[or-cvs] r22974: {website} oops. hello, conflicts. (website/trunk)

[Roger Dingledine]

Author: arma
Date: 2010-08-18 20:36:15 +0000 (Wed, 18 Aug 2010)
New Revision: 22974

Modified:
   website/trunk/Makefile
Log:
oops. hello, conflicts.


Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile	2010-08-18 20:34:20 UTC (rev 22973)
+++ website/trunk/Makefile	2010-08-18 20:36:15 UTC (rev 22974)
@@ -18,8 +18,8 @@
 # 5. make
 # 6. ./publish
 
-TORSVNSTABLE = /home/arma/work/onion/git/tor-021
-TORGIT = /home/arma/work/onion/git/tor/.git
+TORSVNSTABLE = /path/to/your/tor/stable
+TORGIT = /path/to/your/tor/master/.git
 STABLETAG = tor-0.2.1.26
 DEVTAG = tor-0.2.2.14-alpha