From bcdf6f1ac74bc54d8f6b57c294d9bc9ad80a544e Mon Sep 17 00:00:00 2001
From: Jose A Ortega Ruiz <jao@gnu.org>
Date: Sun, 14 Feb 2010 20:04:13 +0100
Subject: Merge conflict in xmonad.cabal resolved

Ignore-this: c65b5ae251b4c3cde6d26b2930a50cb

darcs-hash:20100214190413-748be-8def261bcebaf8675280ffa36d05b53d2631f688.gz
---
 xmobar.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmobar.cabal b/xmobar.cabal
index 34b37c2..d2e1618 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -33,7 +33,7 @@ flag with_inotify
 
 executable xmobar
     main-is:            Main.hs
-    other-Modules:      Xmobar, Config, Parsers, Commands, XUtil, Runnable, Plugins
+    other-Modules:      Xmobar, Config, Parsers, Commands, XUtil, Runnable, Plugins, Plugins.Monitors.StatFS
     ghc-options:        -funbox-strict-fields -Wall
     ghc-prof-options:   -prof -auto-all
 
-- 
cgit v1.2.3