Log In
rpms
/
folks
Clone
Source Code
GIT
Source
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
0d5aa9
Fix merge conflicts
Merged and Committed by Brian Pepple
12 years ago
raw
patch
tree
parents
df6d5835358290e4e66e02ae0ca3e156fe7c1b54
d0f6584ed01f488e4dc1bffde27784bca8be5928
3 files changed.
20 lines added
.
7 lines removed
.
.gitignore
file modified
+3
-0
folks.spec
file modified
+15
-6
sources
file modified
+2
-1
Fix merge conflicts
.gitignore
file modified
+3
-0
folks.spec
file modified
+15
-6
sources
file modified
+2
-1