Permalink
Browse files

Merge branch 'master' of github.com:hackrockcity/domeTransmitter

Conflicts:
	Dacwes.pde
  • Loading branch information...
mhenstell committed Mar 19, 2012
2 parents c11ebf2 + 94378bf commit 37ac1568ada5ccd07599f9caa734df429749410c
Showing with 4 additions and 0 deletions.
  1. +4 −0 Dacwes.pde
View
@@ -81,7 +81,11 @@ public class Dacwes {
private int getAddress(int x, int y) {
if (addressingMode == ADDRESSING_VERTICAL_NORMAL) {
+<<<<<<< HEAD
return (y * w + x);
+=======
+ return (x * w + y);
+>>>>>>> 94378bfd769f07bbcddb09970fb5ad149fd34770
}
return 0;
}

0 comments on commit 37ac156

Please sign in to comment.