cs210-gcal4ruby 0.6.9 → 0.6.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/gcal4ruby/service.rb +1 -6
- metadata +1 -1
data/lib/gcal4ruby/service.rb
CHANGED
|
@@ -85,17 +85,12 @@ module GCal4Ruby
|
|
|
85
85
|
def log(string)
|
|
86
86
|
puts string if debug
|
|
87
87
|
end
|
|
88
|
-
<<<<<<< HEAD
|
|
89
|
-
|
|
90
|
-
# The authenticate method passes the username and password to google servers.
|
|
91
|
-
=======
|
|
92
88
|
|
|
93
89
|
def default_event_feed
|
|
94
90
|
return create_url("www.google.com/calendar/feeds/#{@account}/private/full")
|
|
95
91
|
end
|
|
96
92
|
|
|
97
|
-
# The authenticate method passes an for the service to use to access Google's servers
|
|
98
|
-
>>>>>>> edave/master
|
|
93
|
+
# The authenticate method passes an for the service to use to access Google's servers
|
|
99
94
|
# If authentication succeeds, returns true, otherwise raises the AuthenticationFailed error.
|
|
100
95
|
def authenticate(options = {})
|
|
101
96
|
if not options.has_key?(:service)
|