Unresolved merge conflict pollutes gpgpu-sim dev branch - Githubissues

accel-sim / accel-sim-framework

This is the top-level repository for the Accel-Sim framework.

https://accel-sim.github.io

Other

298 stars 116 forks source link

Unresolved merge conflict pollutes gpgpu-sim dev branch #244

Open FJShen opened 1 year ago

FJShen commented 1 year ago

https://github.com/accel-sim/gpgpu-sim_distribution/blob/53e99da4d21eacbf103ba55bcc9cb6e05219cb91/configs/deprecated-cfgs/SM6_GTX1080/gpgpusim.config.orig#L9C1-L13C90