aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-06-17 15:53:54 -0400
committerMichael <[email protected]>2017-06-17 15:53:54 -0400
commit14efc1fb56c0f9232c3c6097da4f69870ec55bcd (patch)
tree22c48b506c3aef6218f37f3a50a87228f27f4085
parente3f9a6028b3774f7376617502e7f6016dc50dd0e (diff)
parent8862820bf36719d0e1a1defa19495dc2ccb4cfc1 (diff)
downloadshiftos_thereturn-14efc1fb56c0f9232c3c6097da4f69870ec55bcd.tar.gz
shiftos_thereturn-14efc1fb56c0f9232c3c6097da4f69870ec55bcd.tar.bz2
shiftos_thereturn-14efc1fb56c0f9232c3c6097da4f69870ec55bcd.zip
merge conflicts
-rw-r--r--ShiftOS.WinForms/Applications/MindBlow.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/ShiftOS.WinForms/Applications/MindBlow.cs b/ShiftOS.WinForms/Applications/MindBlow.cs
index 7cd2a8f..1fec9e6 100644
--- a/ShiftOS.WinForms/Applications/MindBlow.cs
+++ b/ShiftOS.WinForms/Applications/MindBlow.cs
@@ -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
{