💀 Fix Mistakes

Mac_x86_Pwn_Build_Up/execute_to_change_apt_source.sh

@@ -4,7 +4,6 @@
 gre='\033[34m'
 blu='\033[36m'
 yel='\033[33m'
-<<<<<<< HEAD
 red='\033[31m'
 end='\033[0m'
 
@@ -16,16 +15,6 @@ echo -e "${gre}y = Yes, n = No  (y/N): ${end}\c"
 read choice1
 
 if test $choice1 = 'y' && test $choice0 = 'y' 
-=======
-end='\033[0m'
-
-
-echo -e "${blu}[!] Those command required you to change Apt source, You sure to do this?"
-echo -e "${gre}y = Yes, n = No  (y/n): ${end}\c"
-read choice1
-
-if test $choice1 = 'y'
->>>>>>> 🔥 Added cool stuff
 then
     echo -e "${blu}[*]Backup Apt Source.....${end}"
     sudo cp /etc/apt/sources.list /etc/apt/sources_copy.list
@@ -33,13 +22,9 @@ then
     sudo echo "" > /etc/apt/sources.list
     APT_LIST=`cat apt_source.list`
     echo -e "${blu}[*]Changing Apt List.....${end}"
-<<<<<<< HEAD
     sudo echo "${APT_LIST}" > /etc/apt/sources.list
     echo -e "${blu}[*]Success!!!!${end}"
-=======
-    sudo echo "${APT_LIST}" > etc/apt/sources.list
-    echo -e "${blu}[*]Apt update Success!!!!${end}"
->>>>>>> 🔥 Added cool stuff
+
 else
     echo -e "${yel}[-]FAILED!!!!${end}"
     exit

README.md

@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-## Retr0的寄存器
-
-这个Repo主要会存放一些和课程有关的资料，文件，题目等
-（我的vim又不好用了）
-=======
 # Retr0的寄存器
 
 这个Repo主要会存放一些和课程有关的资料，文件，题目等
@@ -13,4 +7,6 @@
 * `execute_to_change_apt_source.sh` 跟换APT源
 * `execute_to_prepare_for_gnome_.sh` 为移除GNOME桌面环境做重启前准备 需要在运行后执行 `sudo reboot`
 * `execute_to_remove_gnome.sh` 删除和GNOME桌面环境有关的依赖项 **需要注意删除前需要修改`/etc/default/grub`**
->>>>>>> 🔥 Added cool stuff
+
+## Tcache Bin Attacks
+存放着关于Tcache Attack 课程的题目

Tcache_Bin_Attacks/ld-2.27.so

@@ -1 +0,0 @@
-/home/retr0/Sources/glibc-all-in-one/libs/2.27-3ubuntu1_amd64/ld-2.27.so

Tcache_Bin_Attacks/libc.so.6

@@ -1 +0,0 @@
-/home/retr0/Sources/glibc-all-in-one/libs/2.27-3ubuntu1_amd64/libc.so.6