github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Greenshot/Memento/DeleteElementMemento.cs
View file

@ -29,7 +29,7 @@ namespace Greenshot.Memento {
/// </summary>
public class DeleteElementMemento : IMemento {
private IDrawableContainer drawableContainer;
private Surface surface;
private readonly Surface surface;
public DeleteElementMemento(Surface surface, IDrawableContainer drawableContainer) {
this.surface = surface;
@ -50,13 +50,6 @@ namespace Greenshot.Memento {
}
}
public LangKey ActionLanguageKey {
get {
//return LangKey.editor_deleteelement;
return LangKey.none;
}
}
public bool Merge(IMemento otherMemento) {
return false;
}