Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-29 22:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict of Merge branch 'freight/develop' into freight/feature/edr_org_seeder

Browse Source
This commit is contained in:
Michael Abebe
2026-06-01 17:28:07 +03:00
parent fab6819151 edd878bb0b
commit 25fa26e65d
31 changed files with 4021 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngine.tsx
View File

@@ -1,14 +1,10 @@
import { ContractTypePage, } from "@/components/ruleEngine/ContractType";
// src/pages/ruleEngine/RuleEngine.tsx
import ContractTypePage from "@/components/ruleEngine/ContractType";
export const RuleEnginePage = () => {
return <div>
<h3>
Rule Engine Page
</h3>
<div>
<ContractTypePage />
</div>
</div>;
return (
<div className="p-6">
<ContractTypePage />
</div>
);
};