Fix merge conflict

Browse Source

...

This commit is contained in:

lucperkins

2018-07-30 08:50:10 -07:00

parent 548736d5c7 20ac7e501c

commit b1de3d3ad8

56 changed files with 4516 additions and 289 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

static/images/CaseStudy_pinterest_banner1.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 150 KiB

static/images/CaseStudy_pinterest_banner3.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 150 KiB

static/images/CaseStudy_pinterest_banner4.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 126 KiB

static/images/case_studies/pearson_feature.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.6 KiB

static/images/case_studies/pinterest.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

static/images/case_studies/pinterest_feature.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.9 KiB

static/images/community_logos/pearson.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 15 KiB

static/images/community_logos/pinterest.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 KiB

static/images/pinterest_logo.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.7 KiB