Skip to content
Snippets Groups Projects
main.cpp 222 B
Newer Older
// main.cpp
#include <iostream>

int main() {
<<<<<<< HEAD
    std::cout << "This is Feature 1's version" << std::endl;
=======
    std::cout << "This is Feature 2's version" << std::endl;
>>>>>>> feature-2