You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10 lines
351 B
10 lines
351 B
<<<<<<< HEAD
|
|
#Mon Nov 06 21:35:53 CST 2023
|
|
base.0=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
|
=======
|
|
#Thu Nov 09 15:43:06 CST 2023
|
|
base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
|
>>>>>>> develop
|
|
path.0=classes.dex
|
|
renamed.0=classes.dex
|