Fakultas Ilmu Komputer UI

Commit e81b5c26 authored by Tsamara Esperanti Erwin's avatar Tsamara Esperanti Erwin
Browse files

fix conflict on json

parent b111b5c6
...@@ -17,10 +17,7 @@ ...@@ -17,10 +17,7 @@
"transfer_destination_bank_name": null, "transfer_destination_bank_name": null,
"transfer_destination_bank_account_name": null, "transfer_destination_bank_account_name": null,
"transfer_destination_bank_account_number": null, "transfer_destination_bank_account_number": null,
<<<<<<< HEAD
"donation_type": "CSH", "donation_type": "CSH",
=======
>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
"created_at": "2020-05-02T17:20:33.493414+07:00", "created_at": "2020-05-02T17:20:33.493414+07:00",
"updated_at": "2020-05-02T17:20:33.493505+07:00" "updated_at": "2020-05-02T17:20:33.493505+07:00"
} }
\ No newline at end of file
...@@ -40,21 +40,14 @@ ...@@ -40,21 +40,14 @@
"proof_of_payment": "ada", "proof_of_payment": "ada",
"user_bank_name": null, "user_bank_name": null,
"user_bank_account_name": "adada", "user_bank_account_name": "adada",
<<<<<<< HEAD
"bank_account_transfer_destination": "f1291c48-793c-4d44-89fe-6f64452f8aa9", "bank_account_transfer_destination": "f1291c48-793c-4d44-89fe-6f64452f8aa9",
=======
>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
"transfer_destination_bank_name": null, "transfer_destination_bank_name": null,
"transfer_destination_bank_account_name": null, "transfer_destination_bank_account_name": null,
"transfer_destination_bank_account_number": null, "transfer_destination_bank_account_number": null,
"created_at": "2020-04-16T15:04:22.073683+07:00", "created_at": "2020-04-16T15:04:22.073683+07:00",
"updated_at": "2020-04-20T16:58:37.049871+07:00", "updated_at": "2020-04-20T16:58:37.049871+07:00",
<<<<<<< HEAD
"subtotal": "155040.00", "subtotal": "155040.00",
"batch": "e24ae351-0cd1-450a-8050-b56594d680b4", "batch": "e24ae351-0cd1-450a-8050-b56594d680b4",
"batch_name": "batch 1", "batch_name": "batch 1",
"end_date": "2020-10-17" "end_date": "2020-10-17"
=======
"subtotal": "155040.00"
>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
} }
\ No newline at end of file
...@@ -155,9 +155,6 @@ void main() { ...@@ -155,9 +155,6 @@ void main() {
expect(find.text('Rumah Belajar'), findsNWidgets(11)); expect(find.text('Rumah Belajar'), findsNWidgets(11));
expect(find.text('DETAIL'), findsNWidgets(11)); expect(find.text('DETAIL'), findsNWidgets(11));
expect(find.text('Selesai'), findsNothing); expect(find.text('Selesai'), findsNothing);
expect(find.byType(Card), findsNWidgets(3));
expect(find.text('Rumah Belajar'), findsNWidgets(3));
expect(find.text('DETAIL'), findsNWidgets(3));
}); });
testWidgets('No program', (WidgetTester tester) async { testWidgets('No program', (WidgetTester tester) async {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment