Revert the ineffective merge and set the code to the expected source

This reverts commit 9920efd, reversing
changes made to 952735c.

Author: SLsthompson

CHANGELOG.textile

@@ -5,9 +5,6 @@ The @result_offset@ API filter has been removed.
 * The @object_mask@ call modifier no longer accepts Ruby structures. It accepts strings that are Object Masks in the "Extended Object Mask":http://sldn.softlayer.com/article/Object-Masks format.
 * Changed the mechanism for obtaining services to include the Client class. This makes the Ruby API very similar to the API presented by the Python bindings. The old mechanism for obtaining services still works to preserve backward compatibility but you will receive deprecation warnings in debug mode.
 
-*1.0.8*
-* Set a default User-Agent string to be sent with all requests to SoftLayer API.  Provide interface to set a custom User-Agent string.
-
 *1.0.7*
 * Calls to the @getObject@ method of any service should not take parameters. The gem now warns if you make this type of call and ignores the parameters. This prevents @SoftLayer_Virtual_Guest::getObject@ from accidentally creating (billable) VirtualServer instances.
 
@@ -21,11 +18,10 @@ The @result_offset@ API filter has been removed.
 * Fixed a bug where the @result_limit@ and @result_offset@ object filters were just not working.
 
 *1.0.3*
-<<<<<<< HEAD
-* Added a request filter to add result limits to request.  Submitted by JN.  Thanks!
+* Added a request filter to add result limits to request. Submitted by JN. Thanks!
 
 *1.0.2*
-* We have some API routines that start with 'get' but expect arguments anyway.  The code now uses HTTP POST to send requests for which the user has provided arguments regardless of the name of the routine.
+* We have some API routines that start with 'get' but expect arguments anyway. The code now uses HTTP POST to send requests for which the user has provided arguments regardless of the name of the routine.
 
 *1.0*, *1.0.1*
-* Initial release of the gem
+* Initial release of the gem

lib/softlayer/base.rb

@@ -56,6 +56,7 @@ module SoftLayer
   $SL_API_BASE_URL = SoftLayer::API_PUBLIC_ENDPOINT
 end # module SoftLayer
 
+#
 # History:
 #
 # The history has been moved to the CHANGELOG.textile file in the source directory

lib/softlayer/service.rb

@@ -35,4 +35,3 @@ task :gem => :build
 
 task :default => [:spec] do
 end
-