Merge pull request #3059 from psy2k/master

gribozavr · web-flow · commit b10bf6b48747 · 2016-06-18T01:24:27.000-07:00
Changed comment to make more sense
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -2129,7 +2129,7 @@ static void removeValidObjCConflictingMethods(
   methods = methods.slice(0, newEnd - methods.begin());
 }
 
-/// Determine whether the should associate a conflict among the given
+/// Determine whether we should associate a conflict among the given
 /// set of methods with the specified source file.
 static bool shouldAssociateConflictWithSourceFile(
               SourceFile &sf, 

Original file line number	Diff line number	Diff line change
`@@ -2129,7 +2129,7 @@ static void removeValidObjCConflictingMethods(`
`2129`	`2129`	`methods = methods.slice(0, newEnd - methods.begin());`
`2130`	`2130`	`}`
`2131`	`2131`
`2132`		`-/// Determine whether the should associate a conflict among the given`
	`2132`	`+/// Determine whether we should associate a conflict among the given`
`2133`	`2133`	`/// set of methods with the specified source file.`
`2134`	`2134`	`static bool shouldAssociateConflictWithSourceFile(`
`2135`	`2135`	`SourceFile &sf,`