From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 3 Feb 2014 15:38:24 +0100 Subject: Solve some merge problems --- id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF | 1 - 1 file changed, 1 deletion(-) (limited to 'id/server/proxy/src') diff --git a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF index 5e9495128..58630c02e 100644 --- a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF +++ b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF @@ -1,3 +1,2 @@ Manifest-Version: 1.0 -Class-Path: -- cgit v1.2.3