From 81053157b0ec4809aed31cef543894ad6bcc4ae0 Mon Sep 17 00:00:00 2001
From: Wade Alcorn <wade@bindshell.net>
Date: Fri, 13 Jan 2012 14:06:30 +1000
Subject: [PATCH] Attempted git confict fix part 2

---
 tmpRakefile => Rakefile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tmpRakefile => Rakefile (100%)

diff --git a/tmpRakefile b/Rakefile
similarity index 100%
rename from tmpRakefile
rename to Rakefile