resolving merge conflict

oduwsdl · Jun 28, 2018 · 59c640bf88252cf7f438e387db208758ab83b7e0 · 59c640b
2 parents 497764e + 2e8170a
commit 59c640bf88252cf7f438e387db208758ab83b7e0
Unified Split

Showing with 2 additions and 0 deletions.

+2 −0 README.md
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/shawnmjones/archiveit_utilities.svg?branch=master)](https://travis-ci.org/shawnmjones/archiveit_utilities)
+
 # Archive-It Utilities

 Archive-It Utilties is a Python library for extracting information from Archive-It collections. Most work is currently done through a single class `ArchiveItCollection`, which performs screen-scraping in order to acquire general collection metadata, seed lists, and seed metadata.