坏，怎么把冲突提上去了

InvoluteHell · Feb 9, 2024 · db9ec03 · db9ec03
1 parent 84d8cd0
commit db9ec03
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/wanz/README.py b/wanz/README.py
@@ -1,2 +1 @@
 在python 解释器中执行
-可以截图到内存占用超过4g 的时刻
diff --git a/wanz/oom.py b/wanz/oom.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
 "2"*2**32
-=======
-input("0"*2*31)
->>>>>>> 18da45ed0fcce56e091f086c8f032b7b0dc4341e
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		在python 解释器中执行
		可以截图到内存占用超过4g 的时刻