summaryrefslogtreecommitdiffhomepage
path: root/csharp.html.markdown
diff options
context:
space:
mode:
authorDavid Hsieh <davidhsiehlo@gmail.com>2016-03-11 08:39:26 -0600
committerDavid Hsieh <davidhsiehlo@gmail.com>2016-03-11 08:39:26 -0600
commit8d1e2e31ef9c62e2833ccb83cde78caef668f044 (patch)
tree1cca5af13a146c0a36ef760b6264d18875290ec0 /csharp.html.markdown
parent51c2f7ce28caf1cc654bcafc4063f3012cc2f0c3 (diff)
parent6e38442b857a9d8178b6ce6713b96c52bf4426eb (diff)
Merge conflict r-spanish
Diffstat (limited to 'csharp.html.markdown')
-rw-r--r--csharp.html.markdown6
1 files changed, 3 insertions, 3 deletions
diff --git a/csharp.html.markdown b/csharp.html.markdown
index dfdd98de..7d7f4340 100644
--- a/csharp.html.markdown
+++ b/csharp.html.markdown
@@ -45,8 +45,8 @@ using System.Data.Entity;
// Using this code from another source file: using Learning.CSharp;
namespace Learning.CSharp
{
- // Each .cs file should at least contain a class with the same name as the file
- // you're allowed to do otherwise, but shouldn't for sanity.
+ // Each .cs file should at least contain a class with the same name as the file.
+ // You're allowed to do otherwise, but shouldn't for sanity.
public class LearnCSharp
{
// BASIC SYNTAX - skip to INTERESTING FEATURES if you have used Java or C++ before
@@ -630,7 +630,7 @@ on a new line! ""Wow!"", the masses cried";
public static class Extensions
{
- // EXTENSION FUNCTIONS
+ // EXTENSION METHODS
public static void Print(this object obj)
{
Console.WriteLine(obj.ToString());