summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrikant Patnaik2015-02-02 20:05:56 +0530
committerSrikant Patnaik2015-02-02 20:05:56 +0530
commit588aea91aaa5bb95a882f4937823b2ab389bb4a2 (patch)
treed2c660a5bf2019f05f748e27f044851a645ea285
parentbf888cd7de73717a02be583713e9989360dce8dc (diff)
parent79178c8084a3923b0c2d7e3a91bc87ef8b67485e (diff)
downloadFOSSEE-netbook-patcher-588aea91aaa5bb95a882f4937823b2ab389bb4a2.tar.gz
FOSSEE-netbook-patcher-588aea91aaa5bb95a882f4937823b2ab389bb4a2.tar.bz2
FOSSEE-netbook-patcher-588aea91aaa5bb95a882f4937823b2ab389bb4a2.zip
Merge branch 'test' of https://github.com/FOSSEE/FOSSEE-netbook-patcher into test
-rw-r--r--opt/11
-rw-r--r--opt/21
2 files changed, 2 insertions, 0 deletions
diff --git a/opt/1 b/opt/1
new file mode 100644
index 0000000..4886234
--- /dev/null
+++ b/opt/1
@@ -0,0 +1 @@
+First file for testing
diff --git a/opt/2 b/opt/2
new file mode 100644
index 0000000..e4077f6
--- /dev/null
+++ b/opt/2
@@ -0,0 +1 @@
+2nd file for testing