Update Instrument.cs

TheBoxyBear · Jan 15, 2024 · ca6bcf1 · ca6bcf1
1 parent b1678a5
commit ca6bcf1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ChartTools/Instruments/Instrument.cs b/ChartTools/Instruments/Instrument.cs
@@ -110,10 +110,6 @@ public InstrumentType InstrumentType
     /// <summary>
     /// Gives all tracks the same special phrases
     /// </summary>
-<<<<<<<<< Temporary merge branch 1:source/Instruments/Instrument.cs
-    public void ShareStarPower(TrackObjectSource source) => ShareEventsStarPower(source, track => track.SpecialPhrases);
-    private void ShareEventsStarPower<T>(TrackObjectSource source, Func<Track, List<T>> collectionGetter) where T : ITrackObject
-=========
     public SpecialPhrase[] ShareSpecial(TrackObjectSource source) => ShareEventsSpecial(source, track => track.SpecialPhrases);
 
     private T[] ShareEventsSpecial<T>(TrackObjectSource source, Func<Track, List<T>> collectionGetter) where T : ITrackObject