Merge pull request #105 from bandframework/main

Syncing main and develop to cover hotfix
bandframework · Jul 24, 2024 · f48739f · f48739f
2 parents 00f7eeb + fa6469a
commit f48739f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/docs/source/intro.rst b/docs/source/intro.rst
@@ -7,10 +7,6 @@ Taweret for Bayesian Model Mixing
 Bayesian Model Mixing
 ---------------------
 
-__ALLOW THIS INTO MAIN AND REMOVE AS A HOTFIX TO TEST WORKFLOW.__
-=======
-**Good morning, Alexandra!**
-
 In computer simulation studies, it is often the case where a set of theoretically \
 sound models are considered, each intended to describe the true underlying physical phenomena of interest \
 across a sub-region of the domain. These models could differ by their underlying assumptions \

diff --git a/src/Taweret/mix/bivariate_linear.py b/src/Taweret/mix/bivariate_linear.py
@@ -19,10 +19,6 @@
 class BivariateLinear(BaseMixer):
 
     '''
-    __ALLOW THIS INTO MAIN AND REMOVE AS HOTFIX TO TEST WORKFLOW__.
-=======
-    **Look here, Alexandra!**
-
     Local linear Bayesian mixing of two models. This is a general class of
     mixing that offer both density (likelihood) and mean mixing methods.
     The default mixing method is linear mixing of two likelihoods.