diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-08-23 13:52:41 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-08-23 13:52:41 -0400 |
| commit | 72ed0bbdb045695a8dcb7d604a9d834b16f424a9 (patch) | |
| tree | f6a062b47f255b9f211c4f2b9218bcf2dca15eb2 /src/scraping/buxton | |
| parent | cc6040e717632ae9725c134cd8722813cb1733c2 (diff) | |
| parent | 56987012f9690d300b482d8f1b3d83935342322b (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/scraping/buxton')
| -rw-r--r-- | src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud | bin | 0 -> 172 bytes |
| -rw-r--r-- | src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud | bin | 0 -> 172 bytes |
| -rw-r--r-- | src/scraping/buxton/source/Bill_Notes_NewO.docx | bin | 2264571 -> 0 bytes |
| -rw-r--r-- | src/scraping/buxton/source/Bill_Notes_OLPC.docx | bin | 6721592 -> 0 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud b/src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud Binary files differnew file mode 100644 index 000000000..f71886d8c --- /dev/null +++ b/src/scraping/buxton/source/.Bill_Notes_NewO.docx.icloud diff --git a/src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud b/src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud Binary files differnew file mode 100644 index 000000000..30ddb3091 --- /dev/null +++ b/src/scraping/buxton/source/.Bill_Notes_OLPC.docx.icloud diff --git a/src/scraping/buxton/source/Bill_Notes_NewO.docx b/src/scraping/buxton/source/Bill_Notes_NewO.docx Binary files differdeleted file mode 100644 index a514926d2..000000000 --- a/src/scraping/buxton/source/Bill_Notes_NewO.docx +++ /dev/null diff --git a/src/scraping/buxton/source/Bill_Notes_OLPC.docx b/src/scraping/buxton/source/Bill_Notes_OLPC.docx Binary files differdeleted file mode 100644 index 7a636e2d6..000000000 --- a/src/scraping/buxton/source/Bill_Notes_OLPC.docx +++ /dev/null |