From a6931e18ddeed3b7d2c2c63d207eb33cb63a9e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Mon, 25 Jun 2018 15:09:25 -0400
Subject: [PATCH] Back out Apple Conda workaround from !37

---
 .test-conda-env-py3.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index 97b75b47..a149bbe4 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -1,12 +1,7 @@
 name: test-conda-env-py3
 channels:
 - conda-forge
-
-# FIXME: revert to 'defaults' (without quotes) after
-# https://github.com/ContinuumIO/anaconda-issues/issues/9663
-# is addressed. Context: 
-# https://gitlab.tiker.net/inducer/pyopencl/merge_requests/37
-- https://repo.continuum.io/pkgs/main
+- defaults
 
 dependencies:
 - git
-- 
GitLab