merge fixed

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionActivity.java

@@ -79,17 +79,10 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
             SessionWrapper.evaluateTry(currentMsgId, msg_pos == this.msgs.size() - 1, evaluation_value, new SessionWrapper.iTryUpdated() {
                 @Override
                 public void update(int next_try_id) {
-<<<<<<< HEAD
-                    addLogMsg("Msg: "+ sessionFragment.get_current_msg_text()+".");
-                    Bitmap bitmap = BitmapFactory.decodeResource(getResources(),evaluation_bitmap);
-                    sessionFragment.evaluateMsg(bitmap,getString(evaluation_translation),msg_pos);
-                    addLogMsg("#"+(msg_pos<9 ? "0" : "")+(msg_pos+1)+sessionFragment.get_msg_text(msg_pos));
-=======
                     addLogMsg("añadiendo " + sessionFragment.get_current_msg_text() + ".");
                     Bitmap bitmap = BitmapFactory.decodeResource(getResources(), evaluation_bitmap);
                     sessionFragment.evaluateMsg(bitmap, getString(evaluation_translation), msg_pos);
                     addLogMsg("#" + (msg_pos < 9 ? "0" : "") + (msg_pos + 1) + sessionFragment.get_msg_text(msg_pos));
->>>>>>> pictogramactivityrefactor
                     if (!msgs.containsValue(next_try_id))
                         new_try(sessionFragment, next_try_id);
                     if (evaluation_value != null && msg_pos == msgs.size() - 1) {
@@ -155,13 +148,6 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
         }
     }
 
-
-<<<<<<< HEAD
-
-
-
-=======
->>>>>>> pictogramactivityrefactor
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);