Projects >> MyExpenses >>450d7684870fafe20e9f71b32e1bcef9a52505fa

Chunk
Conflicting content 
      db.execSQL("ALTER TABLE accounts add column sort_key integer");
    }
  }
<<<<<<< HEAD

  @SuppressLint("NewApi")
  @Override
  public void onConfigure(SQLiteDatabase db) {
    db.setForeignKeyConstraintsEnabled(true);
    super.onConfigure(db);
  }
=======
>>>>>>> 039d2266246c87363af7f9291b59f9a236490ce7
}
Solution content 
      db.execSQL("ALTER TABLE accounts add column sort_key integer");
    }
  }
}
File
TransactionDatabase.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration