Fix confict

diff --cc extra/http/http-tests.factor
index 681ebd97e26e2684c40465d51368986f43508346,0a4941aaa013aa120a0e520e13fd41bd7b6027aa..51cc93373609418e8bb143be8ccf482772ad0ba9
mode 100755,100644..100755
--- 1/extra/http/http-tests.factor
--- 2/extra/http/http-tests.factor
+++ b/extra/http/http-tests.factor
@@@ -1,6 -1,5 +1,6 @@@
 -USING: http tools.test ;
 +USING: http tools.test multiline tuple-syntax
 +io.streams.string kernel arrays splitting sequences     ;
- IN: temporary
+ IN: http.tests
  
  [ "hello%20world" ] [ "hello world" url-encode ] unit-test
  [ "hello world" ] [ "hello%20world" url-decode ] unit-test

diff --cc extra/http/server/server-tests.factor
index 861607158066ed18dc994c353c108ddb73a4d6ac,627d7d889d8e722b35c88e37079711d685ce2cde..864df9204dc5ba2e5cf1a1d882aca9d3924d40a3
--- 1/extra/http/server/server-tests.factor
--- 2/extra/http/server/server-tests.factor
+++ b/extra/http/server/server-tests.factor
@@@ -1,53 -1,39 +1,53 @@@
 -USING: webapps.file http.server.responders http
 -http.server namespaces io tools.test strings io.server
 -logging ;
 +USING: http.server tools.test kernel namespaces accessors
 +new-slots io http math sequences assocs ;
- IN: temporary
+ IN: http.server.tests
  
 -[ ] [ f [ "404 not found" httpd-error ] with-logging ] unit-test
 -
 -[ "inspect/global" ] [ "/inspect/global" trim-/ ] unit-test
 -
 -[ "index.html" ]
 -[ "http://www.jedit.org/index.html" url>path ] unit-test
 -
 -[ "foo/bar" ]
 -[ "http://www.jedit.org/foo/bar" url>path ] unit-test
 -
 -[ "" ]
 -[ "http://www.jedit.org/" url>path ] unit-test
 -
 -[ "" ]
 -[ "http://www.jedit.org" url>path ] unit-test
 -
 -[ "foobar" ]
 -[ "foobar" secure-path ] unit-test
 -
 -[ f ]
 -[ "foobar/../baz" secure-path ] unit-test
 -
 -[ ] [ f [ "GET ../index.html" parse-request ] with-logging ] unit-test
 -[ ] [ f [ "POO" parse-request ] with-logging ] unit-test
 -
 -[ H{ { "Foo" "Bar" } } ] [ "Foo=Bar" query>hash ] unit-test
 -
 -[ H{ { "Foo" "Bar" } { "Baz" "Quux" } } ]
 -[ "Foo=Bar&Baz=Quux" query>hash ] unit-test
 -
 -[ H{ { "Baz" " " } } ]
 -[ "Baz=%20" query>hash ] unit-test
 -
 -[ H{ { "Foo" f } } ] [ "Foo" query>hash ] unit-test
 +TUPLE: mock-responder path ;
 +
 +C: <mock-responder> mock-responder
 +
 +M: mock-responder call-responder
 +    2nip
 +    path>> on
 +    "text/plain" <content> ;
 +
 +: check-dispatch ( tag path -- ? )
 +    over off
 +    <request> swap default-host get call-responder
 +    write-response get ;
 +
 +[
 +    <dispatcher>
 +        "foo" <mock-responder> "foo" add-responder
 +        "bar" <mock-responder> "bar" add-responder
 +        <dispatcher>
 +            "123" <mock-responder> "123" add-responder
 +            "default" <mock-responder> >>default
 +        "baz" add-responder
 +    default-host set
 +
 +    [ "foo" ] [
 +        "foo" default-host get find-responder path>> nip
 +    ] unit-test
 +
 +    [ "bar" ] [
 +        "bar" default-host get find-responder path>> nip
 +    ] unit-test
 +
 +    [ t ] [ "foo" "foo" check-dispatch ] unit-test
 +    [ f ] [ "foo" "bar" check-dispatch ] unit-test
 +    [ t ] [ "bar" "bar" check-dispatch ] unit-test
 +    [ t ] [ "default" "baz/xxx" check-dispatch ] unit-test
 +    [ t ] [ "default" "baz/xxx//" check-dispatch ] unit-test
 +    [ t ] [ "default" "/baz/xxx//" check-dispatch ] unit-test
 +    [ t ] [ "123" "baz/123" check-dispatch ] unit-test
 +    [ t ] [ "123" "baz///123" check-dispatch ] unit-test
 +
 +    [ t ] [
 +        <request>
 +        "baz" >>path
 +        "baz" default-host get call-responder
 +        dup code>> 300 399 between? >r
 +        header>> "location" swap at "baz/" tail? r> and
 +    ] unit-test
 +] with-scope