Commit d9356bc

committed

AM --React

2 parents abe8e64 + d27186e commit d9356bcCopy full SHA for d9356bc

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,11 @@ function App() {`
`33`	`33`	`<Route path="/a/customers" element={<Customers />} />`
`34`	`34`	`<Route path="/a/orders" element={<Orders />} />`
`35`	`35`	`<Route path='/a/orders/detail' element={<DetailOrder />} />`
	`36`	`+<<<<<<< HEAD`
`36`	`37`	`<Route path="/a/orders/bill" element={<BasicDocument />} />`
	`38`	`+=======`
	`39`	`+ <Route path="/orders/bill" element={<BasicDocument />} />`
	`40`	`+>>>>>>> d27186e767c5d271c6c8f822940542aac08745ba`
`37`	`41`	`<Route path="/a/products" element={<Products />} />`
`38`	`42`	`<Route path="/a/products/add" element={<AddProducts />} />`
`39`	`43`	`<Route path="/a/products/modifier/:id" element={<ModifierProducts />} />`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,6 @@ const styles = StyleSheet.create({`
`134`	`134`	`},`
`135`	`135`	`total: {`
`136`	`136`	`width: '50%',`
`137`		`- textAlign: 'right',`
`138`	`137`	`paddingRight: 8,`
`139`	`138`	`textAlign:'center'`
`140`	`139`	`},`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-server.port=8082`
	`1`	`+server.port=8081`
`2`	`2`	`spring.datasource.url=jdbc:oracle:thin:@nfs315_high?TNS_ADMIN=src/main/resources/Wallet`
`3`	`3`	`spring.datasource.username=MiniProject`
`4`	`4`	`spring.datasource.password=Abdobella4624`

Comments

(0)