Commit 563e7ab

Mark Wieczorek

committed

fix merge conflicts with develop branch

2 parents 54c1b73 + 1a84f6b commit 563e7abCopy full SHA for 563e7ab

1,332 files changed

+78124

-135127

lines changed

.gitattributes
Makefile
README.md
VERSION
examples
- Makefile
- fortran
  - Makefile
  - MarsCrustalThickness
    - MarsCrustalThickness.f95
  - SHCilmPlus
    - TestCilmPlus.f95
  - TimingAccuracy
    - TimingAccuracyGLQ.f95
    - TimingAccuracyGLQC.f95
- python
  - ClassInterface
  - Common
    - FigStyle.py
  - GlobalSpectralAnalysis
    - SHComplexSpectralAnalysis.py
    - SHRealSpectralAnalysis.py
  - GravMag
    - TestCT.py
    - TestGrav.py
  - IOStorageConversions
    - SHConversions.py
    - SHStorage.py
  - LocalizedSpectralAnalysis
  - Makefile
  - Other
    - TestOther.py
  - SHRotations
    - SHRotations.py
  - TestLegendre
    - TestLegendre.py
  - TimingAccuracy
index.html
man/man1
pyshtools
src
www

1,332 files changed

+78124

-135127

lines changed

`‎.gitattributes‎`

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 www/* linguist-documentation
 src/fdoc/* linguist-documentation
 src/pydoc/* linguist-documentation
 +examples/ExampleDataFiles/FSU_mars90.sh linguist-documentation

Comments

(0)