Resolve conflicts

iguana/exchanges/beertest

@@ -1,7 +1,2 @@
 source userpass
-<<<<<<< HEAD
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"BEER\",\"rel\":\"KMD\",\"fixed\":0.777,\"margin\":0.00001}"
-
-=======
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"BEER\",\"rel\":\"KMD\",\"fixed\":1.28700,\"margin\":0.00001}"
->>>>>>> master

iguana/exchanges/mm.c

@@ -249,17 +249,10 @@ int main(int argc, const char * argv[])
                         sprintf(manystrs[num++],"\\\"%s\\\":%0.8f",coinaddr,val);
                         if ( num >= sizeof(manystrs)/sizeof(*manystrs) )
                         {
-<<<<<<< HEAD
-                            sprintf(cmd,"fiat/btch sendmany \"\" \"{ ");
-                            for (i=0; i<num; i++)
-                                sprintf(cmd + strlen(cmd),"%s%c",manystrs[i],i<num-1?',':' ');
-                            strcat(cmd,"}\"");
-=======
                             sprintf(cmd,"fiat/btch sendmany \\\"\\\" \"{");
                             for (i=0; i<num; i++)
                                 sprintf(cmd + strlen(cmd),"%s%s",manystrs[i],i<num-1?",":"");
                             strcat(cmd,"}\" 0");
->>>>>>> master
                             printf("%s\n",cmd);
                             num = 0;
                             memset(manystrs,0,sizeof(manystrs));
@@ -271,17 +264,10 @@ int main(int argc, const char * argv[])
             }
             if ( num > 0 )
             {
-<<<<<<< HEAD
-                sprintf(cmd,"fiat/btch sendmany \"\" \"{ ");
-                for (i=0; i<num; i++)
-                    sprintf(cmd + strlen(cmd),"%s%c",manystrs[i],i<num-1?',':' ');
-                strcat(cmd,"}\"");
-=======
                 sprintf(cmd,"fiat/btch sendmany \\\"\\\" \"{");
                 for (i=0; i<num; i++)
                     sprintf(cmd + strlen(cmd),"%s%s",manystrs[i],i<num-1?",":"");
                 strcat(cmd,"}\" 0");
->>>>>>> master
                 printf("%s\n",cmd);
                 num = 0;
                 memset(manystrs,0,sizeof(manystrs));