fixed merge

Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 source 'http://gemcutter.org'
 
 gem 'rails', '3.0.0.beta4'
+
 gem "mongoid", :git => "git://github.com/durran/mongoid.git"
 gem "bson_ext", "1.0.1"
 gem "haml"

app/controllers/status_messages_controller.rb

@@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController
     
     respond_to do |format|
       format.html 
-      format.xml { render :xml => @status_message }
+      format.xml { render :xml => Post.build_xml_for(@status_message) }
       format.json { render :json => @status_message }
     end
   end

app/models/status_message.rb

@@ -1,7 +1,6 @@
 class StatusMessage < Post
-  include StatusMessagesHelper
-  require_relative '../../lib/net/curl'
- 
+  #include StatusMessagesHelper
+  
   xml_name :status_message
  
   xml_accessor :message
@@ -19,9 +18,6 @@ class StatusMessage < Post
     StatusMessage.newest(User.first.email)
   end
 
-  def self.retrieve_from_friend(friend)
-    StatusMessages.from_xml Curl.get(friend.url+"status_messages.xml")
-  end
 
   def ==(other)
     (self.message == other.message) && (self.owner == other.owner)

config/environments/production.rb

@@ -44,5 +44,5 @@ Diaspora::Application.configure do
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
   config.threadsafe!
-  
+
 end

config/environments/test.rb

@@ -31,10 +31,6 @@ Diaspora::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
-  #
-  #
-  #
-
 
 
 begin