fixed merged conflict

This commit is contained in:
booboy 2018-03-23 15:53:56 -05:00
commit 958d408cb1
2 changed files with 11 additions and 7 deletions

View file

@ -1,7 +0,0 @@
#!/usr/bin/env ruby
#
require './creds.rb'
puts creds.rb.api_key

11
wikipedia_search.rb Executable file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env ruby
# search wikipedia
require 'wikipedia'
search_words = ARGV[0]
page = Wikipedia.find(search_words)
puts page.title+"\n"
puts page.text+"\n"