Author: dongxu Date: Thu Sep 12 02:48:21 2013 New Revision: 1522143 URL: http://svn.apache.org/r1522143 Log: decorate the theme
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522143&r1=1522142&r2=1522143&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/webapp/Hupa.html (original) +++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 02:48:21 2013 @@ -51,6 +51,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD top: 37%; left: 50%; } @@ -62,6 +63,9 @@ ======= top: 37%; >>>>>>> decorate the theme +======= + top: 37%; +>>>>>>> decorate the theme left: 50%; } <<<<<<< HEAD --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org