1 files changed, 0 insertions, 3 deletions
diff --git a/nships.c b/nships.c
index 216e3e0..7b35d92 100644
--- a/nships.c
+++ b/nships.c
@@ -187,13 +187,10 @@ struct ship setPlace(WINDOW * w, int len)
 				}
 				else {
 					s.dir = 0;
-<<<<<<< HEAD
 					if(s.p.x + s.len > ww - 5)
 						s.p.x = s.p.x - (s.p.x + s.len - ww) - 2;
-=======
 					if(s.p.x + s.len > ww - s.len)
 						s.p.x = s.p.x - (s.p.x + s.len - ww) - (s.len + 1);
->>>>>>> origin/main
 				}
 				break;
 			case 10: