Skip to content
Snippets Groups Projects
Commit 6e1fc170 authored by yuxiliu's avatar yuxiliu
Browse files

Merge branch 'feature-1' into main

parents 849fcff3 999caada
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,6 @@
#include <iostream>
int main() {
std::cout << "Original version in main branch" << std::endl;
std::cout << "This is Feature 1's version" << std::endl;
return 0;
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment