resolve comflicts with master

Author: houpc

Project.toml

@@ -12,7 +12,7 @@ Lehmann = "95bf888a-8996-4655-9f35-1c0506bdfefe"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 
 [compat]
-CompositeGrids = "0.0.1, 0.0.2, 0.0.3"
+CompositeGrids = ">= 0.0.4"
 Cuba = "2"
 GreenFunc = "0.1"
 LegendrePolynomials = "0.3"

README.md

@@ -4,4 +4,3 @@
 [![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://numericalEFT.github.io/ElectronGas.jl/dev)
 [![Build Status](https://github.com/numericalEFT/ElectronGas.jl/actions/workflows/CI.yml/badge.svg?branch=master)](https://github.com/numericalEFT/ElectronGas.jl/actions/workflows/CI.yml?query=branch%3Amaster)
 [![codecov](https://codecov.io/gh/numericalEFT/ElectronGas.jl/branch/master/graph/badge.svg?token=9F4KD8O8W2)](https://codecov.io/gh/numericalEFT/ElectronGas.jl)
-