fixed merge error

conda.recipe/meta.yaml

@@ -2,7 +2,7 @@
 
 package:
         name: ipaaca
-        version: "0.1.2"
+        version: "0.1.3"
 
 source:
         - path: ../ipaacalib/cpp
@@ -13,11 +13,7 @@ source:
           folder: ipaaca-py
 
 build:
-<<<<<<< HEAD
-        number: 12
-=======
-        number: 2
->>>>>>> origin/ryt-fullport
+        number: 1
 
 
 requirements: