cs210-gcal4ruby 0.6.9 → 0.6.9.1

data/lib/gcal4ruby/service.rb

@@ -85,17 +85,12 @@ module GCal4Ruby
     def log(string)
       puts string if debug
     end
-<<<<<<< HEAD
-
-    # The authenticate method passes the username and password to google servers.  
-=======
     
     def default_event_feed
       return create_url("www.google.com/calendar/feeds/#{@account}/private/full")
     end
   
-    # The authenticate method passes an  for the service to use to access Google's servers  
->>>>>>> edave/master
+    # The authenticate method passes an  for the service to use to access Google's servers
     # If authentication succeeds, returns true, otherwise raises the AuthenticationFailed error.
     def authenticate(options = {})
       if not options.has_key?(:service)

metadata

@@ -2,7 +2,7 @@
 name: cs210-gcal4ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.9
+  version: 0.6.9.1
 platform: ruby
 authors: 
 - Mike Reich