pentoo-mobile: fix bad merge

pentoo · Dec 13, 2024 · fe8f0b0 · fe8f0b0
1 parent 2f5b8fc
commit fe8f0b0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 44 deletions.
diff --git a/pentoo/pentoo-mobile/pentoo-mobile-2024.3-r1.ebuild b/pentoo/pentoo-mobile/pentoo-mobile-2024.3-r1.ebuild
@@ -36,8 +36,4 @@ PDEPEND="dev-util/frida-tools
 		app-pda/ideviceinstaller
 		app-pda/ifuse
 		app-pda/usbmuxd
-<<<<<<< HEAD:pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
-		pentoo-full? ( llvm-core/clang )
-=======
->>>>>>> 21261a902 (pentoo-mobile: we do not need clang on the livecd for ios):pentoo/pentoo-mobile/pentoo-mobile-2024.3-r1.ebuild
 	)"
diff --git a/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild b/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild