search

batterydied / Aquatica

0 stars 1 forks source link

Virtual cart #30

Closed devinbowler closed 1 week ago

devinbowler commented 1 week ago

Made my code consistent with current common versions on the main.js and AppController.js. This is not using indexedDB but is displaying some placeholder data currently just for initial implementation.

batterydied commented 1 week ago

Conflict needed to be resolved.

batterydied commented 1 week ago

I pressed the wrong button.

batterydied commented 1 week ago

I merged secure checkout already, I'm assuming these two pull requests are the same thing. If not we can reopen later as this branch currently has merge conflict.