Solved merge problems

Author: UweHeber

lib/project_tree/patches/projects_controller_patch.rb

@@ -10,10 +10,6 @@ def self.included(base) # :nodoc:
                     unloadable
                     #the before_filter is who gives the authorization to execute the function
                     before_filter :authorize, :except => [ :index, :children, :autocomplete, :list, :new, :create, :copy, :archive, :unarchive, :destroy ]
-<<<<<<< HEAD
-=======
-                    
->>>>>>> 31b47c6afe4530f64802a925a8e715fd7c8a7c87
                 end
             end
 
@@ -28,11 +24,8 @@ def children
                     # encapsulates all children of current project
                     children = []
 
-<<<<<<< HEAD
                     project.children.each do |child|
-=======
-                    project.children.each do |child| 
->>>>>>> 31b47c6afe4530f64802a925a8e715fd7c8a7c87
+
                         # return only active projects to the result
                         if child.status == 1
                             entry = {}