From c548378aa3ffef8d3266bf3a8575a874a30c1f67 Mon Sep 17 00:00:00 2001
From: Florian <florian.gacon@inria.fr>
Date: Tue, 15 Sep 2020 17:03:24 +0200
Subject: [PATCH] Removed files and fix merge typo
---
src/bvpy/ivp.py | 1 -
test.h5 | Bin 7088 -> 0 bytes
test.xdmf | 16 ----------------
3 files changed, 17 deletions(-)
delete mode 100644 test.h5
delete mode 100644 test.xdmf
diff --git a/src/bvpy/ivp.py b/src/bvpy/ivp.py
index e56f2c5..c0f4de9 100644
--- a/src/bvpy/ivp.py
+++ b/src/bvpy/ivp.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# -*- python -*-
# -*- coding: utf-8 -*-
#
diff --git a/test.h5 b/test.h5
deleted file mode 100644
index 6d788e503da48ddc545a8d5819dc7688ee8133f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7088
zcmeHLJ8u&~5T3IWVjKsONFWG}E9BBeItm9VM%Mrlk0@PYAro6lILkH#6_lo<q(YRG
z{DV+ZK#4?|CWzAiAl!E|-&wcVa$*!g%&n!J$Ii^o&d%=6`L(}(XCc3m7qnbXW@Ir!
z*&SQ^ctbg)Ilg0vXRv4RLq-u#@DsUa{3WyR$~}5etx70K`-G+@hqH<$z2j&Kr#%9G
z_4WqVxMd418T@Q{W~AJ$cN)Mqo1N#iy=JG@Z3fRa>rc8tI}%}@mZ>lXj>=y@tBMWF
z%W?Vp^P<Y<#>|%vPiF+&{N+8?v;5(z_bq>!r#=TJgb(lCU-u*<%)6rHZEWAkWBT>>
zs!m9`Pevc|BA?Ko^Qt!L9@v=E6}9YqkGluf3M$Y2IIr<Y{hllW?mbX4GjA+^Xtf)(
zg1un(1?k;-uwU=CW18pkr0<yC173U&lq_#)$IWBTo5ExSJeiB?S?y4<>JEAtjpVY4
z+qEh#oek?>NG^sKz)U1tjQZJdXTZ;7)KJbU=B(FShy>)j0_&G;C!zE8=Js|${Ak3J
zyc9y+R;}G_qV_R)-0R_#VOxuO&r^T3$2#0rbQwcwzAt<hdRK;u#Z2`<q&y$9Qp6&F
zJzzP2+yD+9O56*Eg9jWu<QR@I$AME1*9maM8#wjwp$8m1;IIWfYzJ`gfKw022OQ59
zaOzz$96aFEyKFdkz}@yZYTqj4D}5Bx%I`b02=#`;qYC-dPtw#M$muxg0Zi)u?pM-o
z-{z$p{T{$Cw_ZMd_x{HLA=jOR{evV;YQQ)B%5XaaIciP@>9?zWcJ{d*uFsuW>5+cL
zc|v`{;dWAP8i6zdX$1bg2#l*M`CX2;9?hk*Va<nHVX0V&>%7%@Sv|HwbaZ{WgQprT
zQ39TQeaVVZCwKc%-`np05aYhL8!Kv=b*DQ|N>6tL-0y9k8@ZlbciBiD0zWx?YU-rt
jncs=@i}W9yXDhp3aVe4SfBQVU|37Rw@jrEd|5JruI)xDn
diff --git a/test.xdmf b/test.xdmf
deleted file mode 100644
index 21bb460..0000000
--- a/test.xdmf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<Xdmf Version="3.0">
- <Domain>
- <Grid Name="mesh" GridType="Uniform">
- <Topology NumberOfElements="18" TopologyType="Triangle" NodesPerElement="3">
- <DataItem Dimensions="18 3" NumberType="UInt" Format="HDF">test.h5:/Mesh/mesh/topology</DataItem>
- </Topology>
- <Geometry GeometryType="XY">
- <DataItem Dimensions="16 2" Format="HDF">test.h5:/Mesh/mesh/geometry</DataItem>
- </Geometry>
- <Attribute Name="f_31" AttributeType="Vector" Center="Node">
- <DataItem Dimensions="16 3" Format="HDF">test.h5:/VisualisationVector/0</DataItem>
- </Attribute>
- </Grid>
- </Domain>
-</Xdmf>
--
GitLab