mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-09-02 15:02:51 +08:00
d00f
7f0e7fdc82
Both conflicts are the register keyword removal meeting a change of ours, so each takes main's signature and keeps what the branch was saying: nic_rx_packet() still returns a bool, and port_ingress_filter_get() stays declared. main has since put its own copy of the STP module in BANK2, so the pragma this branch carried is now duplicated. The one with main's comment stays.