From d33272dfa870ef793b617bb3c0a459e55f24c214 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 17 Nov 2006 18:02:13 +0000
Subject: [PATCH] resolving conflict

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1140 71c3de6d-444a-0410-be80-ed276b4c234a
---
 publish-javadoc.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/publish-javadoc.sh b/publish-javadoc.sh
index cd32d29a30..efdf5b1d73 100644
--- a/publish-javadoc.sh
+++ b/publish-javadoc.sh
@@ -3,15 +3,13 @@
 # publish Hudson javadoc and deploy that into the java.net CVS repository
 # 
 
-# generate javadoc
-cd core
-mvn -o javadoc:javadoc
-cd ..
-
-cd ../../www/javadoc
+pushd ../../../www/javadoc
 cvs update -Pd
+popd
+
+cp -R target/checkout/core/target/site/apidocs/* ../../../www/javadoc
 
-cp -R ../../hudson/main/core/target/site/apidocs/* .
+cd ../../../www/javadoc
 
 # ignore everything under CVS, then
 # ignore all files that are already in CVS, then
-- 
GitLab