pcbddbhelper changed

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java

@@ -222,22 +222,15 @@ public class PCBDBHelper extends SQLiteOpenHelper {
     public void setStudentVocabulary(Vocabulary vocabulary) {
         SQLiteDatabase db = this.getWritableDatabase();
         int id_stu = this.getCurrentUser().get_id_stu();
-<<<<<<< 4748b817cf03a1d7c60a8b8cde67f05075afe99f
-=======
-        int seconds1 = Calendar.getInstance().get(Calendar.SECOND);
-        Log.i(LOG_TAG,"tamVoc to insert: "+vocabulary.size());
->>>>>>> dbcde972e39f99c8d77c15874db2f92ed0515887
         db.delete("collection", "id_stu=" + id_stu, null);
 
         ContentValues values=new ContentValues(6);
         values.put("id_stu", id_stu);
         db.beginTransaction();
         for (Picto picto : vocabulary) {
-<<<<<<< 4748b817cf03a1d7c60a8b8cde67f05075afe99f
-=======
             Log.i(LOG_TAG,"inserting "+picto.get_id()+":"+picto.get_translation()+":"+picto.get_json_attrs()+"-id_sce: "+getActiveSceneForStudent(id_stu));
-                newsize++;
->>>>>>> dbcde972e39f99c8d77c15874db2f92ed0515887
+
+
                 values.put("id_picto", picto.get_id());
                 values.put("id_scene", vocabulary.getId_scene());
                 values.put("url", picto.get_url());