aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-02-03 15:38:24 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-02-03 15:38:24 +0100
commitef35deb727190363d17d693d10f27171787cc92c (patch)
tree92f4a4c6133147716328f93b86239d5dd8fcc629 /id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
parent4333fd60c637f2a739e3db17d00f61c68c465a8e (diff)
downloadmoa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.tar.gz
moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.tar.bz2
moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.zip
Solve some merge problems
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp2
1 files changed, 1 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index b58b997ec..4e8dfc259 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -585,7 +585,7 @@
<div id="formCustomPreview">
<iframe scrolling="none"
title="BKUForm Preview"
- height="220"
+ height="260"
width="250">
</iframe>
</div>