merge popFunc viewer for three functions #483

LinguaPhylo · Jun 4, 2024 · f3b9c8a · f3b9c8a
1 parent 899b31a
commit f3b9c8a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/...e/src/main/java/lphy/base/evolution/coalescent/populationmodel/ExponentialPopulation.java b/...e/src/main/java/lphy/base/evolution/coalescent/populationmodel/ExponentialPopulation.java
@@ -137,15 +137,10 @@ public boolean isAnalytical() {
 
     @Override
     public String toString() {
-<<<<<<< HEAD
         return "Exponential growth at a rate of " + GrowthRate +
                 ",\nwith an initial population size (N0) of " + N0;
     }
 
-=======
-        return "GrowthRate = " + GrowthRate +", N0 = " + N0;
-    }
->>>>>>> 72a57d09f615f413b188480adbeffebd95300fd8
 
     public static void main(String[] args) {
         double GrowthRate = 0.1;

diff --git a/lphy-studio/src/main/java/module-info.java b/lphy-studio/src/main/java/module-info.java
@@ -30,10 +30,7 @@
     // ViewerRegister loads all Viewers
     uses lphystudio.app.graphicalmodelpanel.viewer.Viewer;
     // declare what service interface the provider intends to use
-<<<<<<< HEAD
 
-=======
->>>>>>> 72a57d09f615f413b188480adbeffebd95300fd8
     // the core uses hard core to register all internal Viewers,
     // but extensions need to declare what service interface the provider intends to use for new Viewers.
     provides lphystudio.app.graphicalmodelpanel.viewer.Viewer with lphystudio.viewer.PopSizeFuncViewer;

diff --git a/...dio/src/main/resources/META-INF/services/lphystudio.app.graphicalmodelpanel.viewer.Viewer b/...dio/src/main/resources/META-INF/services/lphystudio.app.graphicalmodelpanel.viewer.Viewer
@@ -7,8 +7,5 @@
 # but extensions need to declare what service interface the provider intends to use for new Viewers.
 # for example,  lphystudio.app.graphicalmodelpanel.viewer.???Viewer
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 72a57d09f615f413b188480adbeffebd95300fd8
 lphystudio.viewer.PopSizeFuncViewer