From 3b749073d7c5d2962446db5668c09d7112ed39b1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 15 Aug 2013 12:47:56 +1000
Subject: [PATCH] updated ignore to ignore these new strange merge files for
 routes.js

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 24cc776699..848fce32ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@ tools/NDepend/
 src/Umbraco.Web.UI/App_Plugins/*
 src/*.psess
 src/*.vspx
+src/Umbraco.Web.UI/umbraco/js/routes.js.*