Fix merge.

.gitignore

@@ -1,6 +1,5 @@
 build/
 *.so
-PythonExtensionPatterns/
 doc/sphinx/build/
 __pycache__/
 .DS_Store

PythonExtensionPatterns.bbprojectd/project.bbprojectdata

@@ -30,43 +30,43 @@
 			<dict>
 				<key>BookmarkData</key>
 				<data>
-				Ym9va0gEAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAA
+				Ym9va1QEAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAA
 				AAAAAAAAAAAAAAAAAAAAOAMAAAUAAAABAQAAVXNlcnMA
-				AAAIAAAAAQEAAHBhdWxyb3NzCQAAAAEBAABEb2N1bWVu
-				dHMAAAAJAAAAAQEAAHdvcmtzcGFjZQAAABcAAAABAQAA
-				UHl0aG9uRXh0ZW5zaW9uUGF0dGVybnMAAwAAAAEBAABk
-				b2MABgAAAAEBAABzcGhpbngAAAYAAAABAQAAc291cmNl
-				AAAgAAAAAQYAAAQAAAAUAAAAJAAAADgAAABMAAAAbAAA
-				AHgAAACIAAAACAAAAAQDAACOZAIAAAAAAAgAAAAEAwAA
-				OfoIAAAAAAAIAAAABAMAADr6CAAAAAAACAAAAAQDAAD9
-				mAsAAAAAAAgAAAAEAwAACYM5AAAAAAAIAAAABAMAAKHM
-				OQAAAAAACAAAAAQDAADkHjoAAAAAAAgAAAAEAwAA9R46
-				AAAAAAAgAAAAAQYAAMAAAADQAAAA4AAAAPAAAAAAAQAA
-				EAEAACABAAAwAQAACAAAAAAEAABBuR/7+QAAABgAAAAB
-				AgAAAgAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAEF
-				AAAEAAAAAwMAAAMAAAAEAAAAAwMAAAYAAAAEAAAAAwMA
-				APUBAAAMAAAAAQEAAE1hY2ludG9zaCBIRAgAAAAEAwAA
-				ACCIPToAAAAIAAAAAAQAAEG4IjLDAAAAJAAAAAEBAAAy
-				NTQwQUFCQS1DNEZFLTM4MTgtQjQ3RC02MEJFOUJFMTJC
-				MjcYAAAAAQIAAIEAAAABAAgA7xcAAAEACAAAAAAAAAAA
-				AAEAAAABAQAALwAAAN4AAAABAgAAZTgwNDdjOWJiN2I0
-				NjU4NTc2MDAxODM1MTE2NGZkZWE0NjE1NzVhNzswMDAw
-				MDAwMDswMDAwMDAwMDswMDAwMDAwMDAwMDAwMDIwO2Nv
-				bS5hcHBsZS5hcHAtc2FuZGJveC5yZWFkLXdyaXRlOzAw
-				MDAwMDAxOzAxMDAwMDAzOzAwMDAwMDAwMDAzYTFlZjU7
-				L3VzZXJzL3BhdWxyb3NzL2RvY3VtZW50cy93b3Jrc3Bh
-				Y2UvcHl0aG9uZXh0ZW5zaW9ucGF0dGVybnMvZG9jL3Nw
-				aGlueC9zb3VyY2UAAADYAAAA/v///wEAAAAAAAAAEQAA
-				AAQQAACYAAAAAAAAAAUQAABAAQAAAAAAABAQAAB4AQAA
-				AAAAAEAQAABoAQAAAAAAAFUQAACgAQAAAAAAAFYQAACY
-				AQAAAAAAAAIgAABEAgAAAAAAABAgAADEAQAAAAAAABEg
-				AAD4AQAAAAAAABIgAADYAQAAAAAAABMgAADoAQAAAAAA
-				ACAgAAAkAgAAAAAAADAgAACYAQAAAAAAAAHAAACsAQAA
-				AAAAABHAAAAUAAAAAAAAABLAAAC4AQAAAAAAAIDwAABQ
-				AgAAAAAAAA==
+				AAAIAAAAAQEAAHBhdWxyb3NzBgAAAAEBAABHaXRIdWIA
+				ABcAAAABAQAAUHl0aG9uRXh0ZW5zaW9uUGF0dGVybnMA
+				AwAAAAEBAABkb2MABgAAAAEBAABzcGhpbngAAAYAAAAB
+				AQAAc291cmNlAAAgAAAAAQYAAAQAAAAUAAAAJAAAABQA
+				AAA0AAAAVAAAAGAAAABwAAAACAAAAAQDAADwLAYAAAAA
+				AAgAAAAEAwAApGAJAAAAAAAIAAAABAMAAJS7IwAAAAAA
+				CAAAAAQDAAAWJzUAAAAAAAgAAAAEAwAAdzZoAAAAAAAI
+				AAAABAMAAMc2aAAAAAAACAAAAAQDAADKNmgAAAAAAAgA
+				AAAEAwAAzDZoAAAAAAAgAAAAAQYAAKgAAAC4AAAAyAAA
+				ANgAAADoAAAA+AAAAAgBAAAYAQAACAAAAAAEAABBv4y4
+				tAAAABgAAAABAgAAAgAAAAAAAAAPAAAAAAAAAAAAAAAA
+				AAAAAAAAAAEFAAAEAAAAAwMAAAMAAAAEAAAAAwMAAAYA
+				AAAEAAAAAwMAAPUBAAARAAAAAQkAAGZpbGU6Ly9sb2Nh
+				bGhvc3QvAAAADAAAAAEBAABNYWNpbnRvc2ggSEQIAAAA
+				BAMAAAAAAK3oAAAACAAAAAAEAABBvBAmtQAAACQAAAAB
+				AQAAMDdCMTVBNkItNzU0QS0zREJELUEwQTMtRjE0MkYx
+				RTFFNDM1GAAAAAECAACBAAAAAQAAAO8TAAABAAAAAAAA
+				AAAAAAABAAAAAQEAAC8AAADaAAAAAQIAAGFjMDQyNGZm
+				Mzc5YWJjMmFjOTAyYzY0Yjg5MTNhNGM3NGI2NDRjNmY7
+				MDAwMDAwMDA7MDAwMDAwMDA7MDAwMDAwMDAwMDAwMDAy
+				MDtjb20uYXBwbGUuYXBwLXNhbmRib3gucmVhZC13cml0
+				ZTswMDAwMDAwMTswMTAwMDAwNDswMDAwMDAwMDAwNjgz
+				NmNjOy91c2Vycy9wYXVscm9zcy9naXRodWIvcGF1bHJv
+				c3MvcHl0aG9uZXh0ZW5zaW9ucGF0dGVybnMvZG9jL3Nw
+				aGlueC9zb3VyY2UAAADkAAAA/v///wEAAAAAAAAAEgAA
+				AAQQAACAAAAAAAAAAAUQAAAoAQAAAAAAABAQAABgAQAA
+				AAAAAEAQAABQAQAAAAAAAFUQAACIAQAAAAAAAFYQAACA
+				AQAAAAAAAAIgAABIAgAAAAAAAAUgAACsAQAAAAAAABAg
+				AADIAQAAAAAAABEgAAD8AQAAAAAAABIgAADcAQAAAAAA
+				ABMgAADsAQAAAAAAACAgAAAoAgAAAAAAADAgAACAAQAA
+				AAAAAAHAAACUAQAAAAAAABHAAAAUAAAAAAAAABLAAACg
+				AQAAAAAAAIDwAABUAgAAAAAAAA==
 				</data>
 				<key>FileURL</key>
-				<string>file://localhost/Users/paulross/Documents/workspace/PythonExtensionPatterns/doc/sphinx/source/</string>
+				<string>file://localhost/Users/paulross/GitHub/paulross/PythonExtensionPatterns/doc/sphinx/source/</string>
 				<key>RelativePath</key>
 				<string>./doc/sphinx/source</string>
 				<key>TypeID</key>