You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/11/11 11:14:23 UTC
[5/5] git commit: MARMOTTA-356: fixed wrong conflict resolution
MARMOTTA-356: fixed wrong conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c0620f7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c0620f7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c0620f7f
Branch: refs/heads/develop
Commit: c0620f7f8cf15da5d8430d059c593b0a897997bf
Parents: 6560c23
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Nov 11 11:07:32 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Nov 11 11:07:32 2013 +0100
----------------------------------------------------------------------
.../platform/core/api/templating/TemplatingService.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c0620f7f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
index ef288be..c930222 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
@@ -44,18 +44,10 @@ public interface TemplatingService {
final static String RDF_HTML_TPL = "rdfhtml.ftl";
- final static String ADMIN_TPL = "admin.ftl";
-
- final static String ERROR_404_TPL = "404.ftl";
-
- final static String RDF_HTML_TPL = "rdfhtml.ftl";
-
static final String DEFAULT_PROJECT = "marmotta";
static final String DEFAULT_STYLE = "blue";
- static final String ADMIN_TPL = "admin.ftl";
-
public final static String DEFAULT_WEBSERVICE_TITLE = "Webservice";
void initDataModel();