Merge pull request #12 from SLsthompson/master

Fixing a failed merge

Author: underscorephil

CHANGELOG.textile

@@ -21,11 +21,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
-