Resolved conflict with C code in md

Author: rishvic

contents/gaussian_elimination/gaussian_elimination.md

@@ -312,11 +312,11 @@ In code, this process might look like this:
 {% sample lang="java" %}
 [import:14-30, lang:"java"](code/java/GaussianElimination.java)
 {% sample lang="c" %}
-[import:5-13, lang:"c_cpp"](code/c/gaussian_elimination.c)
-[import:19-34, lang:"c_cpp"](code/c/gaussian_elimination.c)
+[import:5-13, lang:"c"](code/c/gaussian_elimination.c)
+[import:19-34, lang:"c"](code/c/gaussian_elimination.c)
 {% sample lang="cpp" %}
-[import:27-28, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
-[import:12-28, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
+[import:27-28, lang:"cpp"](code/c++/gaussian_elimination.cpp)
+[import:12-28, lang:"cpp"](code/c++/gaussian_elimination.cpp)
 {% sample lang="hs" %}
 [import:10-17, lang:"haskell"](code/haskell/gaussianElimination.hs)
 [import:44-46, lang:"haskell"](code/haskell/gaussianElimination.hs)
@@ -386,7 +386,7 @@ Here is what it might look like in code:
 {% sample lang="java" %}
 [import:32-40, lang:"java"](code/java/GaussianElimination.java)
 {% sample lang="c" %}
-[import:36-41, lang:"c_cpp"](code/c/gaussian_elimination.c)
+[import:36-41, lang:"c"](code/c/gaussian_elimination.c)
 {% sample lang="cpp" %}
 [import:32-35, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
 {% sample lang="hs" %}
@@ -407,9 +407,9 @@ When we put everything together, it looks like this:
 {% sample lang="jl" %}
 [import:1-45, lang:"julia"](code/julia/gaussian_elimination.jl)
 {% sample lang="c" %}
-[import:15-48, lang:"c_cpp"](code/c/gaussian_elimination.c)
+[import:15-48, lang:"c"](code/c/gaussian_elimination.c)
 {% sample lang="cpp" %}
-[import:8-49, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
+[import:8-49, lang:"cpp"](code/c++/gaussian_elimination.cpp)
 {% sample lang="rs" %}
 [import:41-78, lang:"rust"](code/rust/gaussian_elimination.rs)
 {% sample lang="hs" %}
@@ -446,9 +446,9 @@ Here it is in code:
 {% sample lang="jl" %}
 [import:67-93, lang:"julia"](code/julia/gaussian_elimination.jl)
 {% sample lang="c" %}
-[import:64-82, lang:"c_cpp"](code/c/gaussian_elimination.c)
+[import:64-82, lang:"c"](code/c/gaussian_elimination.c)
 {% sample lang="cpp" %}
-[import:52-64, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
+[import:52-64, lang:"cpp"](code/c++/gaussian_elimination.cpp)
 {% sample lang="rs" %}
 This code does not exist yet in rust, so here's Julia code (sorry for the inconvenience)
 [import:67-93, lang:"julia"](code/julia/gaussian_elimination.jl)
@@ -489,9 +489,9 @@ In code, it looks like this:
 {% sample lang="jl" %}
 [import:47-64, lang:"julia"](code/julia/gaussian_elimination.jl)
 {% sample lang="c" %}
-[import:50-62, lang:"c_cpp"](code/c/gaussian_elimination.c)
+[import:50-62, lang:"c"](code/c/gaussian_elimination.c)
 {% sample lang="cpp" %}
-[import:67-79, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
+[import:67-79, lang:"cpp"](code/c++/gaussian_elimination.cpp)
 {% sample lang="rs" %}
 [import:79-94, lang:"rust"](code/rust/gaussian_elimination.rs)
 {% sample lang="hs" %}
@@ -546,9 +546,9 @@ There are also plenty of other solvers that do similar things that we will get t
 {% sample lang="jl" %}
 [import, lang:"julia"](code/julia/gaussian_elimination.jl)
 {% sample lang="c" %}
-[import, lang:"c_cpp"](code/c/gaussian_elimination.c)
+[import, lang:"c"](code/c/gaussian_elimination.c)
 {% sample lang="cpp" %}
-[import, lang:"c_cpp"](code/c++/gaussian_elimination.cpp)
+[import, lang:"cpp"](code/c++/gaussian_elimination.cpp)
 {% sample lang="rs" %}
 [import, lang:"rust"](code/rust/gaussian_elimination.rs)
 {% sample lang="hs" %}