resolving conflicts

Browse Source

...

This commit is contained in:

Savitha Raghunathan

2020-08-23 12:13:37 -04:00

parent 8d56047830 03e4a9edc5

commit 95c94c03d5

504 changed files with 16169 additions and 11399 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/community_logos/adform_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB

static/images/community_logos/appformix_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.9 KiB

static/images/community_logos/apprenda_logo.png

BIN

Binary file not shown.

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

static/images/community_logos/aqua_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.5 KiB

static/images/community_logos/box_logo.png

BIN

Binary file not shown.

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

static/images/community_logos/capitalone.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 23 KiB

static/images/community_logos/citrix_logo.png

BIN

Binary file not shown.

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

static/images/community_logos/core_os_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

static/images/community_logos/crunchy_data_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 29 KiB

static/images/community_logos/datadog_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB

static/images/community_logos/deis_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.2 KiB

static/images/community_logos/distelli_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.8 KiB

static/images/community_logos/ebay_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

static/images/community_logos/elastickube_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.8 KiB

static/images/community_logos/goldman_sachs_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.1 KiB

static/images/community_logos/ibm_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.3 KiB

static/images/community_logos/ing.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB

static/images/community_logos/intel_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.6 KiB

static/images/community_logos/kabam_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

static/images/community_logos/mesosphere_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

static/images/community_logos/mirantis_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.4 KiB

static/images/community_logos/new_york_times_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.9 KiB

static/images/community_logos/nordstrom.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

static/images/community_logos/northwestern-mutual.png

BIN

Binary file not shown.

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

static/images/community_logos/nuage_network_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

static/images/community_logos/nyt.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.2 KiB

static/images/community_logos/openai.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.7 KiB

static/images/community_logos/pearson.png

BIN

Binary file not shown.

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

static/images/community_logos/pearson_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.0 KiB

static/images/community_logos/pinterest.png

BIN

Binary file not shown.

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

static/images/community_logos/platform9_logo.png

BIN

Binary file not shown.

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

static/images/community_logos/puppet_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB

static/images/community_logos/rancher_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 16 KiB

static/images/community_logos/red_hat_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.5 KiB

static/images/community_logos/slingtv_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 17 KiB

static/images/community_logos/soundcloud_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

static/images/community_logos/sysdig_cloud_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.1 KiB

static/images/community_logos/sysdig_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

static/images/community_logos/ubuntu_cannonical_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 17 KiB

static/images/community_logos/viacom_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

static/images/community_logos/we_pay_logo.png

BIN

Binary file not shown.

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

static/images/community_logos/wercker_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

static/images/community_logos/wikimedia_foundation_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB

static/images/community_logos/wikimedia_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

static/images/community_logos/workiva_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.5 KiB

static/images/community_logos/ygrene_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 20 KiB

static/images/community_logos/zulily_logo.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB