0000000000000000000000000000000000000000 53be44ae75adac039daa42a803464b2b9c8ef7a4 Jian Xie <313116976@qq.com> 1685630136 +0800	clone: from https://github.com/OSU-NLP-Group/LLM-Knowledge-Conflict.git
53be44ae75adac039daa42a803464b2b9c8ef7a4 6d4dca7ae1ca1ab35982239b4c19c8f8f9709023 Jian Xie <313116976@qq.com> 1685633926 +0800	commit: conflictQA submission
6d4dca7ae1ca1ab35982239b4c19c8f8f9709023 f3eb3e535dd5b7fc2dcdbbe4a06cc4f022ff7c60 Jian Xie <313116976@qq.com> 1685634473 +0800	commit: Update README.md
f3eb3e535dd5b7fc2dcdbbe4a06cc4f022ff7c60 834c9d417537f56f4caf07bc845cfeb3eee43da4 Jian Xie <313116976@qq.com> 1685634484 +0800	pull --ff --recurse-submodules --progress origin: Merge made by the 'ort' strategy.
834c9d417537f56f4caf07bc845cfeb3eee43da4 8486a5a0d90fa805eeea7abd75fed4f106b22206 Jian Xie <313116976@qq.com> 1685687360 +0800	commit: add ChatGPT version
8486a5a0d90fa805eeea7abd75fed4f106b22206 7dd1ea0a53a4f7447258d6f756cd61f00f28b3c6 Jian Xie <313116976@qq.com> 1685687362 +0800	pull --ff --recurse-submodules --progress origin: Merge made by the 'ort' strategy.
7dd1ea0a53a4f7447258d6f756cd61f00f28b3c6 11f6b1a2decea41c80edb9d8a0da24e0629de9d9 Jian Xie <313116976@qq.com> 1685693111 +0800	pull --ff --recurse-submodules --progress origin: Fast-forward
11f6b1a2decea41c80edb9d8a0da24e0629de9d9 fc077e5395027a60544ccacfc0d2e1e4310a3868 Jian Xie <313116976@qq.com> 1685802824 +0800	commit: Update README.md
fc077e5395027a60544ccacfc0d2e1e4310a3868 10ef5a64a3aa0a2592d2f997cf46689f2312d92f Jian Xie <313116976@qq.com> 1685802857 +0800	commit: Update README.md
10ef5a64a3aa0a2592d2f997cf46689f2312d92f 4eb85e9428964de03e424824fa2c3e1a9e2efff0 Jian Xie <313116976@qq.com> 1685802889 +0800	commit: Create ConflictQA.py
4eb85e9428964de03e424824fa2c3e1a9e2efff0 3d493cfbd50ef3230b65f223a1290c08d62eb605 Jian Xie <313116976@qq.com> 1687512354 +0800	pull --ff --recurse-submodules --progress origin: Fast-forward
3d493cfbd50ef3230b65f223a1290c08d62eb605 d0624d5ca2340351357de7bcf087f83b116c4b96 Jian Xie <313116976@qq.com> 1687512408 +0800	commit: add code
