diff options
Resolve merge failure
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EntityBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EntityBase.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 4e25c46..e183f9d 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
| @@ -130,8 +130,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 130 | { | 130 | { |
| 131 | return (EntityBase) MemberwiseClone(); | 131 | return (EntityBase) MemberwiseClone(); |
| 132 | } | 132 | } |
| 133 | |||
| 134 | public abstract void SetText(string text, Vector3 color, double alpha); | ||
| 135 | } | 133 | } |
| 136 | 134 | ||
| 137 | //Nested Classes | 135 | //Nested Classes |