From 21f03155449c1f2b0b97dd793499d436bb8c0838 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 1 Oct 2015 15:46:28 -0400 Subject: [PATCH] set project-load/sha-conflict to pending --- sbt/src/sbt-test/project-load/sha-conflict/{test => pending} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt/src/sbt-test/project-load/sha-conflict/{test => pending} (100%) diff --git a/sbt/src/sbt-test/project-load/sha-conflict/test b/sbt/src/sbt-test/project-load/sha-conflict/pending similarity index 100% rename from sbt/src/sbt-test/project-load/sha-conflict/test rename to sbt/src/sbt-test/project-load/sha-conflict/pending