rendered paste body[8087] $ git merge origin
Updating 52c8ceb..c5f8438
Fast forward
bin/doQuery.pl | 4 +
bin/listGraphs.pl | 4 +-
bin/KM/RemoteSPARQL.pm => lib/KM/RemoteCrowbar.pm | 56 +++++---
lib/KM/RemoteDAV.pm | 153 +++++++++++++++++++++
{bin => lib}/KM/RemoteSPARQL.pm | 0
{bin => lib}/KM/RemoteServer.pm | 12 ++-
scraping/bin/runNflTeams.sh | 3 +
scraping/bin/runScraper.pl | 25 ++++
scraping/scripts/nflTeams.js | 79 +++++++++++
9 files changed, 308 insertions(+), 28 deletions(-)
copy bin/KM/RemoteSPARQL.pm => lib/KM/RemoteCrowbar.pm (66%)
create mode 100644 lib/KM/RemoteDAV.pm
rename {bin => lib}/KM/RemoteSPARQL.pm (100%)
rename {bin => lib}/KM/RemoteServer.pm (91%)
create mode 100755 scraping/bin/runNflTeams.sh
create mode 100755 scraping/bin/runScraper.pl
create mode 100644 scraping/scripts/nflTeams.js
ret 0 in /home/dlc/devel/kmp-dev/repo at 1205212850