merge branch origin/master

[Rakka.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index cf4cf8868008d7df0a11442ce23a974c95a76b1c..3df4d8b23a910a86ce895238dac27e26c0e9cf4d 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -8,7 +8,7 @@ import           Data.List
 import           Data.Maybe
 import Network.Socket
 import           Network.HTTP.Lucu
-import           OpenSSL
+import OpenSSL
 import           Rakka.Environment
 import           Rakka.Resource.CheckAuth
 import           Rakka.Resource.DumpRepos
@@ -19,11 +19,10 @@ import           Rakka.Resource.Object
 import           Rakka.Resource.Render
 import           Rakka.Resource.Search
 import           Rakka.Resource.SystemConfig
--- import           Rakka.Resource.TrackBack
 import           Rakka.Resource.Users
 import           Rakka.Storage
 import           Subversion
-import           System.Console.GetOpt
+import           System.Console.GetOpt -- FIXME: Use better library than this.
 import           System.Directory
 import           System.Environment
 import           System.Exit
@@ -166,7 +165,6 @@ resTree env
                 , (["search.html" ], resSearch       env)
                 , (["search.xml"  ], resSearch       env)
                 , (["systemConfig"], resSystemConfig env)
-                -- , (["trackback"   ], resTrackBack    env)
                , (["users"       ], resUsers        env)
                 ]