From 7bc90420b3e75e2d47789c4ff23ea279748645a7 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Tue, 6 Dec 2016 15:06:50 +0100
Subject: [PATCH] fixed merge
---
examples/advection_gpu.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/examples/advection_gpu.py b/examples/advection_gpu.py
index 67c89ece3..59a622395 100644
--- a/examples/advection_gpu.py
+++ b/examples/advection_gpu.py
@@ -139,11 +139,7 @@ if __name__=='__main__':
'use_builtin_copy':True,
'stretching': {
'formulation': StretchingFormulation.GRAD_UW,
-<<<<<<< HEAD
'order':64
-=======
- 'order':16
->>>>>>> f03a24d1fe54c00f58e70368a14ef9043deb4581
}
}
}
--
GitLab