diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
| commit | 8074865580b5fa28817b37c9ad2e8c992ebef977 (patch) | |
| tree | 475cd1ed9bc517dffbf023e7d9c7d16ce2bde8c5 /id/server/doc/conf/moa-id-proxy/errorpages/errorpage-proxy_empty.jsp | |
| parent | 234f17d14f9f48655c27d54114df0aa2593cf6d8 (diff) | |
| parent | 714a8cb32dd5585829dfc1926e56971425a2a692 (diff) | |
| download | moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.gz moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.bz2 moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.zip | |
Merge branch 'moa-2.1-Snapshot'
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
pom.xml
Diffstat (limited to 'id/server/doc/conf/moa-id-proxy/errorpages/errorpage-proxy_empty.jsp')
| -rw-r--r-- | id/server/doc/conf/moa-id-proxy/errorpages/errorpage-proxy_empty.jsp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/id/server/doc/conf/moa-id-proxy/errorpages/errorpage-proxy_empty.jsp b/id/server/doc/conf/moa-id-proxy/errorpages/errorpage-proxy_empty.jsp deleted file mode 100644 index 0b3992bfd..000000000 --- a/id/server/doc/conf/moa-id-proxy/errorpages/errorpage-proxy_empty.jsp +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<%@ page contentType="text/html; charset=UTF-8" %> -<html> -<head> -<title>Ein Fehler ist aufgetreten</title> -</head> - -<body> -<h1>Fehler bei der Anmeldung</h1> -<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p> - -</body> -</html>
\ No newline at end of file |