From 7ffc58892a88578f682716a60703618fd2378808 Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 31 Jul 2013 18:26:35 +0200 Subject: [PATCH] marker already present in the openshift repository, delete to avoid merge conflicts --- .openshift/markers/java7 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .openshift/markers/java7 diff --git a/.openshift/markers/java7 b/.openshift/markers/java7 deleted file mode 100644 index e69de29b..00000000