From b60e2c07c742fc7997dccaf2bdac000f374c3416 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Fri, 18 Apr 2014 07:04:31 +0900
Subject: [PATCH] (refs #327)Move feed.scala.xml to helper package because it
 breaks compilation by overriding xml package

---
 src/main/scala/app/IndexController.scala   | 2 +-
 src/main/twirl/{ => helper}/feed.scala.xml | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/main/twirl/{ => helper}/feed.scala.xml (100%)

diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala
index 3bc662034..a51025d4b 100644
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -48,7 +48,7 @@ trait IndexControllerBase extends ControllerBase {
 
   get("/activities.atom"){
     contentType = "application/atom+xml; type=feed"
-    xml.feed(getRecentActivities())
+    helper.xml.feed(getRecentActivities())
   }
 
   /**
diff --git a/src/main/twirl/feed.scala.xml b/src/main/twirl/helper/feed.scala.xml
similarity index 100%
rename from src/main/twirl/feed.scala.xml
rename to src/main/twirl/helper/feed.scala.xml