Merge pull request ribot#8 from gerardogtn/patch-1

Fix grammar mistake
danqbin · Jul 30, 2015 · 55c207b · 55c207b
2 parents a3f7e5f + ce1f388
commit 55c207b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/project_and_code_guidelines.md b/project_and_code_guidelines.md
@@ -81,7 +81,7 @@ Layout files should match the name of the Android components that they are inten
 | AdapterView item | ---                    | `item_person.xml`             |
 | Partial layout   | ---                    | `partial_stats_bar.xml`       |
 
-A slighly different case is when we are creating a layout that is going to be infladed by an `Adapter`, e.g to populate a `ListView`. In this case, the name of the layout should start with `item_`
+A slighly different case is when we are creating a layout that is going to be inflated by an `Adapter`, e.g to populate a `ListView`. In this case, the name of the layout should start with `item_`
 
 Note that there are cases where these rules will not be possible to apply. For example, when creating layout files that are intended to be part of other layouts. In this case you should use the prefix `partial_`
 
@@ -610,4 +610,4 @@ When using the Espresso api is a common practise to place chained method in new
 onView(withId(R.id.view))
         .perform(scrollTo())
         .check(matches(isDisplayed()))
-```
+```