Mirrors/remote-jobs
2
0
Fork 0
mirror of https://github.com/remoteintech/remote-jobs synced 2024-11-10 06:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix conflicts

Browse source
This commit is contained in:
dougaitken 2015-11-10 21:20:50 +00:00
parent 30c6803f16
commit 8fa5fe1725
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -58,6 +58,7 @@ Consumer Financial Protection Bureau | http://www.consumerfinance.gov |
Core-Apps | http://www.core-apps.com/ | USA
CoreOS | https://coreos.com/ |
[Corgibytes](/company-profiles/corgibytes.md) | http://corgibytes.com | US East Coast
Coupa | http://www.coupa.com/ |
[Crew](/company-profiles/crew.md) | https://crew.co | Everywhere
Crossover | https://www.crossover.com | Everywhere
DataStax | http://www.datastax.com/ |
@ -65,11 +66,7 @@ DealDash | http://www.dealdash.com |
Delighted | https://delighted.com |
[DigitalOcean](/company-profiles/digitalocean.md) | https://www.digitalocean.com/ | Everywhere
[DNSimple](/company-profiles/dnsimple.md) | https://dnsimple.com/ | Everywhere
<<<<<<< HEAD
[Discourse](/company-profiles/discourse.md) | https://discourse.org/ | Everywhere
=======
Discourse | http://www.discourse.org/ | Everywhere
>>>>>>> upstream/master
+[Discourse](/company-profiles/discourse.md) | https://discourse.org/ | Everywhere
Docker | https://www.docker.com |
Doist | https://doist.io |
[DramaFever](/company-profiles/dramafever.md) | http://www.dramafever.com | USA