# Conflicts:
#	src/main/java/cn/edu/nju/software/pass/PassManager.java

# Conflicts:
#	src/main/java/cn/edu/nju/software/ir/basicblock/BasicBlockRef.java
#	src/main/java/cn/edu/nju/software/ir/generator/InstructionVisitor.java
#	src/main/java/cn/edu/nju/software/ir/opt/TestOpt.java
#	src/main/java/cn/edu/nju/software/pass/PassManager.java
#	src/test/resources/2023/17_div.s

# Conflicts:
#	.gitignore
#	src/main/java/cn/edu/nju/software/Main.java
#	src/main/java/cn/edu/nju/software/ir/basicblock/BasicBlockRef.java
#	src/main/java/cn/edu/nju/software/ir/opt/TestOpt.java
#	src/main/java/cn/edu/nju/software/pass/MemToReg.java
#	src/main/java/cn/edu/nju/software/pass/PassManager.java
#	src/test/java/cn/edu/nju/software/FrontEndTest.java
#	src/test/resources/2023/102_cvt_fl.ll
#	src/test/resources/2023hidden/00_comment2.ll
#	src/test/resources/2023hidden/01_multiple_returns.ll
#	src/test/resources/2023hidden/02_ret_in_block.ll
#	src/test/resources/2023hidden/03_branch.ll
#	src/test/resources/2023hidden/04_break_continue.ll
#	src/test/resources/2023hidden/05_param_name.ll
#	src/test/resources/2023hidden/06_func_name.ll
#	src/test/resources/2023hidden/07_arr_init_nd.ll
#	src/test/resources/2023hidden/08_global_arr_init.ll
#	src/test/resources/2023hidden/09_BFS.ll
#	src/test/resources/2023hidden/10_DFS.ll
#	src/test/resources/2023hidden/11_BST.ll
#	src/test/resources/2023hidden/12_DSU.ll
#	src/test/resources/2023hidden/13_LCA.ll
#	src/test/resources/2023hidden/14_dp.ll
#	src/test/resources/2023hidden/15_graph_coloring.ll
#	src/test/resources/2023hidden/16_k_smallest.ll
#	src/test/resources/2023hidden/17_maximal_clique.ll
#	src/test/resources/2023hidden/18_prim.ll
#	src/test/resources/2023hidden/19_search.ll
#	src/test/resources/2023hidden/20_sort.ll
#	src/test/resources/2023hidden/21_union_find.ll
#	src/test/resources/2023hidden/22_matrix_multiply.ll
#	src/test/resources/2023hidden/24_array_only.ll
#	src/test/resources/2023hidden/26_scope4.ll
#	src/test/resources/2023hidden/27_scope5.ll
#	src/test/resources/2023hidden/28_side_effect2.ll
#	src/test/resources/2023hidden/29_long_line.ll
#	src/test/resources/2023hidden/31_many_indirections.ll
#	src/test/resources/2023hidden/32_many_params3.ll
#	src/test/resources/2023hidden/33_multi_branch.ll
#	src/test/resources/2023hidden/34_multi_loop.ll
#	src/test/resources/2023hidden/35_math.ll
#	src/test/resources/2023hidden/37_dct.ll
#	src/test/resources/2023hidden/39_fp_params.ll
#	src/test/resources/2023part/zeroinitializer.ll
#	src/test/resources/linked.ll

# Conflicts:
#	src/main/java/cn/edu/nju/software/Main.java
#	src/main/java/cn/edu/nju/software/backend/riscinstruction/util/RiscOpcode.java
#	src/main/java/cn/edu/nju/software/frontend/lexer/SysYLexer.java
#	src/main/java/cn/edu/nju/software/frontend/parser/SysYParser.java
#	src/main/java/cn/edu/nju/software/ir/basicblock/BasicBlockRef.java
#	src/main/java/cn/edu/nju/software/ir/value/ConstValue.java
#	src/main/java/cn/edu/nju/software/ir/value/LocalVar.java
#	src/main/java/cn/edu/nju/software/pass/MemToReg.java
#	src/main/java/cn/edu/nju/software/pass/PassManager.java
#	src/test/java/cn/edu/nju/software/FrontEndTest.java
#	src/test/java/cn/edu/nju/software/TestBackEndIO.java
#	src/test/resources/2023/101_float_arr
#	src/test/resources/2023/102_cvt_fl
#	src/test/resources/2023/102_cvt_fl.ll
#	src/test/resources/2023/11_add2.s
#	src/test/resources/2023/14_subc.s
#	src/test/resources/2023/17_div.s
#	src/test/resources/2023/37_op_priority3.s
#	src/test/resources/2023/45_comment1.s
#	src/test/resources/2023hidden/35_math.ll
#	src/test/resources/2023hidden/37_dct.ll
#	src/test/resources/c/add.c
#	src/test/resources/linked.ll
#	src/test/resources/ll/add.ll
#	src/test/resources/ll/floattest1.ll
#	src/test/resources/ll/square.ll
#	src/test/resources/ll/test1.ll
#	src/test/resources/sy/test1.sy
#	src/test/resources/sylib.ll
#	target/test-classes/ll/square.ll