Commit conflictivo resuelto

Belsel · Belsel · commit 0872a6171108 · 2021-02-08T09:11:50.000+01:00
diff --git a/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/HelloBacking.java b/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/HelloBacking.java
@@ -9,7 +9,7 @@
 public class HelloBacking {
 
     public String getHello() {
-        return "Hello world, last change, I promise!";
+        return "Hello world, it was a lie!";
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`public class HelloBacking {`
`10`	`10`
`11`	`11`	`public String getHello() {`
`12`		`- return "Hello world, last change, I promise!";`
	`12`	`+ return "Hello world, it was a lie!";`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`}`