main.cpp

@@ -10,8 +10,4 @@ int main()
     cout << "A + B = " << a + b << '\n';
     cout<< "A - B = " << a - b << '\n';
     cout<< "A * B = " << a * b << '\n';
-<<<<<<< HEAD
-    cout<< "A / B = " << a / b << '\n';
-=======
->>>>>>> 391e34f1bffbfd05c1ff4f4fd26786799f23a3bd
 }

project.cbp

@@ -32,7 +32,6 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="..gitignore" />
 		<Unit filename="main.cpp" />
 		<Extensions />
 	</Project>