Fixed merge conflict by using remote changes
[soc.git] / src / soc / fu / trap /
drwxr-xr-x   ..
-rw-r--r-- 8960 main_stage.py
-rw-r--r-- 2725 pipe_data.py