Resolve conflict

hoglet67 · Dec 8, 2019 · 54f4b28 · 54f4b28
1 parent f08f5e9
commit 54f4b28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/scripts/Profiles/BBC/BBC_Micro.txt b/src/scripts/Profiles/BBC/BBC_Micro.txt
@@ -0,0 +1,6 @@
+sampling7=5,5,5,5,5,5,5,0,8,12,0,0
+geometry7=156,26,480,256,576,288,1,4,12000000,768,5000,625,4,0
+sampling=2,2,2,2,2,2,2,0,6,5,0,0
+geometry=176,29,640,256,768,288,1,8,16000000,1024,5000,625,4,0
+auto_switch=2
+palette_control=1
diff --git a/src/scripts/Profiles/BBC/Oric.txt b/src/scripts/Profiles/BBC/Oric.txt
@@ -0,0 +1,2 @@
+sampling=0,0,0,0,0,0,0,0,8,0,0,0
+geometry=108,34,504,270,576,288,1,4,12000000,768,0,625,4,0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		sampling=0,0,0,0,0,0,0,0,8,0,0,0
		geometry=108,34,504,270,576,288,1,4,12000000,768,0,625,4,0