merge conflicts

This commit is contained in:
Michael 2017-06-17 15:53:54 -04:00
commit 14efc1fb56

View file

@ -27,13 +27,13 @@ namespace ShiftOS.WinForms.Applications
kc = new KeysConverter();
box = mybox;
}
public override bool CanRead => true;
public override bool CanRead { get { return true; } }
public override bool CanSeek => false;
public override bool CanSeek { get { return false; } }
public override bool CanWrite => true;
public override bool CanWrite { get { return true; } }
public override long Length => box.Text.Length;
public override long Length { get { return box.Text.Length; } }
public override long Position
{