From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Tue, 12 Mar 2013 20:38:03 +0000 (-0400)
Subject: Merge branch 'temp'
X-Git-Tag: v0.0.7~211
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=5ab47cde8196b12682ee573361586f357dd35882;p=mkjsf-moved-to-github.git

Merge branch 'temp'

Conflicts:
	src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
---

5ab47cde8196b12682ee573361586f357dd35882
diff --cc src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index 0c9fc6f,4585fc0..fc23ae2
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@@ -86,8 -86,8 +86,8 @@@ public class Pz2Config implements Modul
    }
  
    @Override
--  public String getConfigFilePath() {
 -    return ""; // moduleConfig.getConfigFilePath();
++  public String getConfigFilePath() {
 +    return (moduleConfig != null ? moduleConfig.getConfigFilePath() : "nopath");
    }