Resolved merge conflicts in favour of Johann's changes

smsharma · Sep 4, 2019 · 19837ed · 19837ed
2 parents c86f22a + 08464f0
commit 19837ed
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 50 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Johann Brehmer, Siddarth Mishra-Sharma, Joeri Hermans, Gilles Louppe, and Kyle Cranmer
+Copyright (c) 2019 Johann Brehmer, Siddharth Mishra-Sharma, Joeri Hermans, Gilles Louppe, and Kyle Cranmer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/draft/figures/individual_lens_predictions.pdf b/draft/figures/individual_lens_predictions.pdf
diff --git a/draft/figures/simulations.pdf b/draft/figures/simulations.pdf
diff --git a/draft/lensing-lfi.tex b/draft/lensing-lfi.tex
diff --git a/figures/deflection_maps.pdf b/figures/deflection_maps.pdf
diff --git a/figures/individual_lens_predictions.pdf b/figures/individual_lens_predictions.pdf
diff --git a/figures/simulations.pdf b/figures/simulations.pdf
diff --git a/notebooks/1_simulations.ipynb b/notebooks/1_simulations.ipynb
diff --git a/notebooks/2_inference_per_image.ipynb b/notebooks/2_inference_per_image.ipynb
diff --git a/notebooks/X_deflection_maps.ipynb b/notebooks/X_deflection_maps.ipynb