From b700b1315afa9b77104cf30ca1aff0c4a33b029d Mon Sep 17 00:00:00 2001
From: simon <simon@zagal.(none)>
Date: Mon, 9 Feb 2009 22:01:16 +0100
Subject: * mergin stuff yo, why do i have to do this again?

---
 app/controllers/nodes_controller.rb | 2 +-
 test/fixtures/users.yml             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 34394df..4c48bb5 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -1,6 +1,6 @@
 class NodesController < ApplicationController
   include Auditing
-  
+
   layout 'admin'
   
   before_filter :find_node, :only => [:create, :show, :edit, :update, :destroy]
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 3afb3fd..5b32afc 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,4 +1,3 @@
-
 quentin:
   id:                        1
   login:                     quentin
@@ -13,4 +12,5 @@ aaron:
   email:                     aaron@example.com
   salt:                      5be6f9cdd04fd7ab3c91cd32a5334ba2339b8005
   crypted_password:          740a48caf7dd5ff11318d812d57c0a0928cfbc12 # 'monkey'
-  created_at:                <%= 1.days.ago.to_s :db %>
\ No newline at end of file
+  created_at:                <%= 1.days.ago.to_s :db %>
+
-- 
cgit v1.3