diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
| commit | e1a7da578e195a59f4981bc56a9b8c615f1e69d2 (patch) | |
| tree | f77153bf75580e1672a2442020708a872053cc59 /spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml | |
| parent | 9753d2e1c9fde6778e070825b141e0e69323c9b6 (diff) | |
| parent | f5440a189b89bd4aa69d6d54445579484d5d7228 (diff) | |
| download | moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.gz moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.bz2 moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.zip | |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/server/doc/handbook/config/config.html
Diffstat (limited to 'spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml')
| -rw-r--r-- | spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml index 564572b10..ac59587b0 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ <faceted-project>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
- <installed facet="jst.web" version="2.4"/>
<installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file + <installed facet="jst.web" version="2.3"/>
+</faceted-project>
|