Merge branch 'hotfix-1.2.1' into develop

pkpdeveloper · pkpdeveloper · commit 58b6027fb48e · 2017-04-12T23:29:01.000+05:30
diff --git a/app/src/main/java/pankajpatel/gitflow/MainActivity.java b/app/src/main/java/pankajpatel/gitflow/MainActivity.java
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                Snackbar.make(view, "Replace with  own action", Snackbar.LENGTH_LONG)
                         .setAction("Action", null).show();
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`27`	`27`	`fab.setOnClickListener(new View.OnClickListener() {`
`28`	`28`	`@Override`
`29`	`29`	`public void onClick(View view) {`
`30`		`- Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)`
	`30`	`+ Snackbar.make(view, "Replace with own action", Snackbar.LENGTH_LONG)`
`31`	`31`	`.setAction("Action", null).show();`
`32`	`32`	`}`
`33`	`33`	`});`