From ef6e94d08a21bc25369e5a38b7532687b229162d Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 30 Nov 2018 11:47:58 +0000 Subject: [PATCH] Removing merge conflict text --- _coops/agile-collective.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/_coops/agile-collective.md b/_coops/agile-collective.md index 59e501d..b738bae 100644 --- a/_coops/agile-collective.md +++ b/_coops/agile-collective.md @@ -56,8 +56,5 @@ technologies: Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team – including our client. As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the ‘Code Club’ on a Wednesday afternoon which is aimed at inspiring young people to get into coding. -<<<<<<< HEAD -======= ->>>>>>> dev There is also a company-wide obsession with cycling of various kinds.