/*
 * To change this license header, choose License Headers in Project Properties.
 * To change this template file, choose Tools | Templates
 * and open the template in the editor.
 */
package ch.heigvd.res.mygitsandboxproject;

/**
 *
 * @author Bob 
 * @author Alice
 */
public class MyApplication {

  /**
   * @param args the command line arguments (by bob)
   */
  public static void main(String[] args) {
    // TODO code application logic here
  }
  
}

@@ -354,11 +354,13 @@
 (by 
-bob
+alice
 )%0A  

Update by Alice, after rebase skip