From 4a2350e8417aab7d8a594d2f2c8dd3649f7a8f72 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 7 Sep 2016 12:09:10 +0000
Subject: [PATCH] Enable test on windows.

It looks like it was disable just because we were missing a demangler.

llvm-svn: 280805
---
 lld/test/ELF/conflict.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lld/test/ELF/conflict.s b/lld/test/ELF/conflict.s
index 2dcd2c5..3ca033a 100644
--- a/lld/test/ELF/conflict.s
+++ b/lld/test/ELF/conflict.s
@@ -1,4 +1,4 @@
-# REQUIRES: x86, shell
+# REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: not ld.lld %t1.o %t1.o -o %t2 2>&1 | FileCheck -check-prefix=DEMANGLE %s
-- 
2.7.4